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;
MIME-Version: 1.0
References: <20230712015747.77263-1-wangkefeng.wang@huawei.com>
In-Reply-To: <20230712015747.77263-1-wangkefeng.wang@huawei.com>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Thu, 13 Jul 2023 00:55:23 +0900
Message-ID: <CAK7LNARuR5cturyngN31Oy=PwMG_-p5iOek2BuDSKHSyZg44Xg@mail.gmail.com>
Subject: Re: [PATCH -next] modpost: move some defines to the file head
To:     Kefeng Wang <wangkefeng.wang@huawei.com>,
        Luis Chamberlain <mcgrof@kernel.org>
Cc:     Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Nicolas Schier <nicolas@fjasle.eu>,
        linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
        Palmer Dabbelt <palmer@rivosinc.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

+To: Luis Chamberlain, the commiter of the breakage


On Wed, Jul 12, 2023 at 10:44=E2=80=AFAM Kefeng Wang <wangkefeng.wang@huawe=
i.com> wrote:
>
> with "module: Ignore RISC-V mapping symbols too", build error occurs,
>
> scripts/mod/modpost.c: In function =E2=80=98is_valid_name=E2=80=99:
> scripts/mod/modpost.c:1055:57: error: =E2=80=98EM_RISCV=E2=80=99 undeclar=
ed (first use in this function)
>   return !is_mapping_symbol(name, elf->hdr->e_machine =3D=3D 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] =3D=3D '$')
                 return true;

       return false;


>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
>  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
>


--
Best Regards

Masahiro Yamada