[PATCH] tools/resolve_btfids: fix build with musl libc

[PATCH] tools/resolve_btfids: fix build with musl libc

[Natanael Copa]

Include the header that defines u32.

Fixes: 9707ac4fe2f5 ("tools/resolve_btfids: Refactor set sorting with types from btf_ids.h")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218647
Cc: stable@vger.kernel.org
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
This fixes build of 6.6.23 and 6.1.83 kernels for Alpine Linux, which
uses musl libc. I assume that GNU libc indirecly pulls in linux/types.h.

 tools/include/linux/btf_ids.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h
index 72535f00572f..72ea363d434d 100644
--- a/tools/include/linux/btf_ids.h
+++ b/tools/include/linux/btf_ids.h
@@ -3,6 +3,8 @@
 #ifndef _LINUX_BTF_IDS_H
 #define _LINUX_BTF_IDS_H
 
+#include <linux/types.h> /* for u32 */
+
 struct btf_id_set {
 	u32 cnt;
 	u32 ids[];
-- 
2.44.0

Re: [PATCH] tools/resolve_btfids: fix build with musl libc

[Greg Thelen]

Natanael Copa <ncopa@alpinelinux.org> wrote:

> Include the header that defines u32.

> Fixes: 9707ac4fe2f5 ("tools/resolve_btfids: Refactor set sorting with  
> types from btf_ids.h")
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218647

Tested-by: Greg Thelen <gthelen@google.com>

> Cc: stable@vger.kernel.org
> Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
> ---
> This fixes build of 6.6.23 and 6.1.83 kernels for Alpine Linux, which
> uses musl libc. I assume that GNU libc indirecly pulls in linux/types.h.

>   tools/include/linux/btf_ids.h | 2 ++
>   1 file changed, 2 insertions(+)

> diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h
> index 72535f00572f..72ea363d434d 100644
> --- a/tools/include/linux/btf_ids.h
> +++ b/tools/include/linux/btf_ids.h
> @@ -3,6 +3,8 @@
>   #ifndef _LINUX_BTF_IDS_H
>   #define _LINUX_BTF_IDS_H

> +#include <linux/types.h> /* for u32 */
> +
>   struct btf_id_set {
>   	u32 cnt;
>   	u32 ids[];

Re: [PATCH] tools/resolve_btfids: fix build with musl libc

[Alexei Starovoitov]

On Thu, Mar 28, 2024 at 9:18 AM Greg Thelen <gthelen@google.com> wrote:
>
> Natanael Copa <ncopa@alpinelinux.org> wrote:
>
> > Include the header that defines u32.
>
> > Fixes: 9707ac4fe2f5 ("tools/resolve_btfids: Refactor set sorting with
> > types from btf_ids.h")
> > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218647
>
> Tested-by: Greg Thelen <gthelen@google.com>
>
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
> > ---
> > This fixes build of 6.6.23 and 6.1.83 kernels for Alpine Linux, which
> > uses musl libc. I assume that GNU libc indirecly pulls in linux/types.h.

Ok. Applied to bpf tree and added the above explanation to commit log.

Re: [PATCH] tools/resolve_btfids: fix build with musl libc

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Thu, 28 Mar 2024 11:59:13 +0100 you wrote:
> Include the header that defines u32.
> 
> Fixes: 9707ac4fe2f5 ("tools/resolve_btfids: Refactor set sorting with types from btf_ids.h")
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218647
> Cc: stable@vger.kernel.org
> Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
> 
> [...]

Here is the summary with links:
  - tools/resolve_btfids: fix build with musl libc
    https://git.kernel.org/bpf/bpf/c/62248b22d01e

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html