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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EFD2EB64DC for ; Fri, 21 Jul 2023 09:12:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231671AbjGUJML (ORCPT ); Fri, 21 Jul 2023 05:12:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231594AbjGUJMA (ORCPT ); Fri, 21 Jul 2023 05:12:00 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE3243AB1; Fri, 21 Jul 2023 02:11:39 -0700 (PDT) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R6kH01G4LzNmSR; Fri, 21 Jul 2023 17:07:56 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) 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; Fri, 21 Jul 2023 17:11:16 +0800 Message-ID: Date: Fri, 21 Jul 2023 17:11:15 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: [PATCH -next] modpost: move some defines to the file head Content-Language: en-US To: Palmer Dabbelt , CC: , , , , , References: From: Kefeng Wang In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, kindly ping, the build issue still exist in Linux-next. On 2023/7/13 0:28, Palmer Dabbelt wrote: > On Wed, 12 Jul 2023 08:55:23 PDT (-0700), masahiroy@kernel.org wrote: >> +To: Luis Chamberlain, the commiter of the breakage >> >> >> >> On Wed, Jul 12, 2023 at 10:44 AM Kefeng Wang >> wrote: >>> >>> 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. >> >> >> >> BTW, why is the flag 'is_riscv' needed? >> >> >> All symbols starting with '$' look special to me. >> >> >> >> Why not like this? >> >> >>        if (str[0] == '$') >>                  return true; >> >>        return false; > > There's a bit of commentary in the v1 > , but essentially it's not necessary.  I just wanted to play things safe and avoid changing the mapping symbol detection elsewhere in order to deal with RISC-V. > > IIRC we decided $ was special in RISC-V because there were some other > ports that behaved that way, but it wasn't universal.  If folks are OK > treating $-prefixed symbols as special everywhere that's fine with me, I > just wasn't sure what the right answer was. > There's also some similar arch-specific-ness with the labels and such in > here. > >>> 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) >>>  { >>> -- >>> 2.41.0 >>>