From patchwork Wed Jul 12 01:57:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 118775 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp871303vqm; Tue, 11 Jul 2023 19:42:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlEhx/9qIMPHXo8pFvnJUmZQimXfNLVr0b0LXxmWctA3R2EWmcN4+KNxrZIwnqmTl7lEKcck X-Received: by 2002:a17:906:224a:b0:977:d660:c5aa with SMTP id 10-20020a170906224a00b00977d660c5aamr915481ejr.31.1689129761484; Tue, 11 Jul 2023 19:42:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689129761; cv=none; d=google.com; s=arc-20160816; b=SrJk65PVXMWa7wmXdxi4HUYb/pl1W+KJOyAsECT7ffCi11TQ82gVhbGbNKvcFu0DVv b9x7Inf7pNeST31ws/i0YLXLpMHTw1B3wOMvDuEQj8V/feWoTfGcuYUrnRzBVjfu/1m9 uzwNd89Wsiu2TzOO6nj5sqg6CxDZSAHOVAPpJ872+8P3fYKAXdFCLgGsF5Jpm1WggEp9 fI4FHvmGeG5DM0CXZOBdd0y2xGKBI2DO78vxcxTRCu+3lZd5WRJNw6CU54LwU7tNuLUf qzhe5uXOIUYxA9xCts9D7MxZWh2C1+M1aHW2Y/bcPcMwk6+pyV+UJduJr74zenKhbXzP GDRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Ox5EMXepqWa6WGU88zHM5BVeH6HeysTJAKLj3WklMiQ=; fh=m3s8vxWP4dgNFSWKQWR0ITfJ2DNQ2GhRrt8NdTgaa28=; b=Jx/b/bbBp4EoeNZMLcvnxql6UOJSY4i6oUF2JrTZ/rzTJMPYCHCiQOo2MUA2dtvSaU 1aCLTl/LfsQc5rzf4Xbif/V30WO1hVPf85EFIm+qc054b8tkMGMjiv+NBiIFfIEuODL3 jfwHpm1g5qGoaMO0kz8JRFTeXtkttTrT5umlS76si/hRS6NY/4V83vojds8n2KVKmhvx acGmaKMhEbFKtGzN5wT9ZX6G2/CvlCqdCyfHvGiTOtTjY0yBcfpcvB2Mc4PoJ3s7xtbw ot0pUXSB6//+o3/mnSkgZCXYV7zblcxLYBZwxnYK+ug1tmRM04rZWp5+a+tJkFgYhuSF CVqg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ox10-20020a170907100a00b00993a37985dfsi3514763ejb.179.2023.07.11.19.42.18; Tue, 11 Jul 2023 19:42:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231238AbjGLBoN (ORCPT + 99 others); Tue, 11 Jul 2023 21:44:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229512AbjGLBoL (ORCPT ); Tue, 11 Jul 2023 21:44:11 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570B01712; Tue, 11 Jul 2023 18:44:10 -0700 (PDT) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4R10rP6Hspz1JC9d; Wed, 12 Jul 2023 09:43:33 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 12 Jul 2023 09:44:07 +0800 From: Kefeng Wang To: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , , CC: Palmer Dabbelt , Kefeng Wang Subject: [PATCH -next] modpost: move some defines to the file head Date: Wed, 12 Jul 2023 09:57:47 +0800 Message-ID: <20230712015747.77263-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771180928965732380 X-GMAIL-MSGID: 1771180928965732380 with "module: Ignore RISC-V mapping symbols too", build error occurs, scripts/mod/modpost.c: In function ‘is_valid_name’: scripts/mod/modpost.c:1055:57: error: ‘EM_RISCV’ undeclared (first use in this function) return !is_mapping_symbol(name, elf->hdr->e_machine == EM_RISCV); Fix it by moving the EM_RISCV to the file head, also some other defines in case of similar problem in the future. Signed-off-by: Kefeng Wang --- scripts/mod/modpost.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 7c71429d6502..885cca272eb8 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -60,6 +60,22 @@ static unsigned int nr_unresolved; #define MODULE_NAME_LEN (64 - sizeof(Elf_Addr)) +#ifndef EM_RISCV +#define EM_RISCV 243 +#endif + +#ifndef R_RISCV_SUB32 +#define R_RISCV_SUB32 39 +#endif + +#ifndef EM_LOONGARCH +#define EM_LOONGARCH 258 +#endif + +#ifndef R_LARCH_SUB32 +#define R_LARCH_SUB32 55 +#endif + void __attribute__((format(printf, 2, 3))) modpost_log(enum loglevel loglevel, const char *fmt, ...) { @@ -1428,22 +1444,6 @@ static int addend_mips_rel(uint32_t *location, Elf_Rela *r) return 0; } -#ifndef EM_RISCV -#define EM_RISCV 243 -#endif - -#ifndef R_RISCV_SUB32 -#define R_RISCV_SUB32 39 -#endif - -#ifndef EM_LOONGARCH -#define EM_LOONGARCH 258 -#endif - -#ifndef R_LARCH_SUB32 -#define R_LARCH_SUB32 55 -#endif - static void section_rela(struct module *mod, struct elf_info *elf, Elf_Shdr *sechdr) {