* [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc
@ 2024-09-05 15:06 Milan P. Stanić
2024-09-05 19:44 ` Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Milan P. Stanić @ 2024-09-05 15:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Milan P . Stanić
build fails on musl libc (alpine linux) with this error:
../util/cpuinfo-riscv.c: In function 'cpuinfo_init':
../util/cpuinfo-riscv.c:63:21: error: '__NR_riscv_hwprobe' undeclared (first use in this function); did you mean 'riscv_hwprobe'?
63 | if (syscall(__NR_riscv_hwprobe, &pair, 1, 0, NULL, 0) == 0
| ^~~~~~~~~~~~~~~~~~
| riscv_hwprobe
../util/cpuinfo-riscv.c:63:21: note: each undeclared identifier is reported only once for each function it appears in
ninja: subcommand failed
add '#include "asm/unistd.h"' to util/cpuinfo-riscv.c fixes build
Signed-off-by: Milan P. Stanić <mps@arvanta.net>
---
util/cpuinfo-riscv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
index 497ce12680..8cacc67645 100644
--- a/util/cpuinfo-riscv.c
+++ b/util/cpuinfo-riscv.c
@@ -9,6 +9,7 @@
#ifdef CONFIG_ASM_HWPROBE_H
#include <asm/hwprobe.h>
#include <sys/syscall.h>
+#include <asm/unistd.h>
#endif
unsigned cpuinfo;
--
2.46.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc
2024-09-05 15:06 [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc Milan P. Stanić
@ 2024-09-05 19:44 ` Richard Henderson
2024-09-05 19:57 ` Peter Maydell
2024-09-06 0:53 ` Alistair Francis
2024-09-06 1:28 ` Alistair Francis
2 siblings, 1 reply; 5+ messages in thread
From: Richard Henderson @ 2024-09-05 19:44 UTC (permalink / raw)
To: Milan P. Stanić, qemu-devel; +Cc: Peter Maydell
On 9/5/24 08:06, Milan P. Stanić wrote:
> build fails on musl libc (alpine linux) with this error:
>
> ../util/cpuinfo-riscv.c: In function 'cpuinfo_init':
> ../util/cpuinfo-riscv.c:63:21: error: '__NR_riscv_hwprobe' undeclared (first use in this function); did you mean 'riscv_hwprobe'?
> 63 | if (syscall(__NR_riscv_hwprobe, &pair, 1, 0, NULL, 0) == 0
> | ^~~~~~~~~~~~~~~~~~
> | riscv_hwprobe
> ../util/cpuinfo-riscv.c:63:21: note: each undeclared identifier is reported only once for each function it appears in
> ninja: subcommand failed
>
> add '#include "asm/unistd.h"' to util/cpuinfo-riscv.c fixes build
>
> Signed-off-by: Milan P. Stanić <mps@arvanta.net>
> ---
> util/cpuinfo-riscv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
> index 497ce12680..8cacc67645 100644
> --- a/util/cpuinfo-riscv.c
> +++ b/util/cpuinfo-riscv.c
> @@ -9,6 +9,7 @@
> #ifdef CONFIG_ASM_HWPROBE_H
> #include <asm/hwprobe.h>
> #include <sys/syscall.h>
> +#include <asm/unistd.h>
I suppose this is ok, but...
For some reason musl processes asm/unistd.h at build-time to produce <bits/syscall.h>,
which is included by <sys/syscall.h>. This will be "fixed" the next time musl is rebuilt
against current kernel headers.
r~
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc
2024-09-05 19:44 ` Richard Henderson
@ 2024-09-05 19:57 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2024-09-05 19:57 UTC (permalink / raw)
To: Richard Henderson; +Cc: Milan P. Stanić, qemu-devel
On Thu, 5 Sept 2024 at 20:44, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 9/5/24 08:06, Milan P. Stanić wrote:
> > build fails on musl libc (alpine linux) with this error:
> >
> > ../util/cpuinfo-riscv.c: In function 'cpuinfo_init':
> > ../util/cpuinfo-riscv.c:63:21: error: '__NR_riscv_hwprobe' undeclared (first use in this function); did you mean 'riscv_hwprobe'?
> > 63 | if (syscall(__NR_riscv_hwprobe, &pair, 1, 0, NULL, 0) == 0
> > | ^~~~~~~~~~~~~~~~~~
> > | riscv_hwprobe
> > ../util/cpuinfo-riscv.c:63:21: note: each undeclared identifier is reported only once for each function it appears in
> > ninja: subcommand failed
> >
> > add '#include "asm/unistd.h"' to util/cpuinfo-riscv.c fixes build
> >
> > Signed-off-by: Milan P. Stanić <mps@arvanta.net>
> > ---
> > util/cpuinfo-riscv.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
> > index 497ce12680..8cacc67645 100644
> > --- a/util/cpuinfo-riscv.c
> > +++ b/util/cpuinfo-riscv.c
> > @@ -9,6 +9,7 @@
> > #ifdef CONFIG_ASM_HWPROBE_H
> > #include <asm/hwprobe.h>
> > #include <sys/syscall.h>
> > +#include <asm/unistd.h>
>
> I suppose this is ok, but...
>
> For some reason musl processes asm/unistd.h at build-time to produce <bits/syscall.h>,
> which is included by <sys/syscall.h>. This will be "fixed" the next time musl is rebuilt
> against current kernel headers.
It matches how we include asm/unistd.h in memfd.c so
we can get __NR_memfd_create, so it seems OK to me.
We ought to be able to build against older musl too, not
just those which are up-to-date with their kernel headers.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc
2024-09-05 15:06 [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc Milan P. Stanić
2024-09-05 19:44 ` Richard Henderson
@ 2024-09-06 0:53 ` Alistair Francis
2024-09-06 1:28 ` Alistair Francis
2 siblings, 0 replies; 5+ messages in thread
From: Alistair Francis @ 2024-09-06 0:53 UTC (permalink / raw)
To: Milan P. Stanić; +Cc: qemu-devel, Peter Maydell
On Fri, Sep 6, 2024 at 1:08 AM Milan P. Stanić <mps@arvanta.net> wrote:
>
> build fails on musl libc (alpine linux) with this error:
>
> ../util/cpuinfo-riscv.c: In function 'cpuinfo_init':
> ../util/cpuinfo-riscv.c:63:21: error: '__NR_riscv_hwprobe' undeclared (first use in this function); did you mean 'riscv_hwprobe'?
> 63 | if (syscall(__NR_riscv_hwprobe, &pair, 1, 0, NULL, 0) == 0
> | ^~~~~~~~~~~~~~~~~~
> | riscv_hwprobe
> ../util/cpuinfo-riscv.c:63:21: note: each undeclared identifier is reported only once for each function it appears in
> ninja: subcommand failed
>
> add '#include "asm/unistd.h"' to util/cpuinfo-riscv.c fixes build
>
> Signed-off-by: Milan P. Stanić <mps@arvanta.net>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> util/cpuinfo-riscv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
> index 497ce12680..8cacc67645 100644
> --- a/util/cpuinfo-riscv.c
> +++ b/util/cpuinfo-riscv.c
> @@ -9,6 +9,7 @@
> #ifdef CONFIG_ASM_HWPROBE_H
> #include <asm/hwprobe.h>
> #include <sys/syscall.h>
> +#include <asm/unistd.h>
> #endif
>
> unsigned cpuinfo;
> --
> 2.46.0
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc
2024-09-05 15:06 [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc Milan P. Stanić
2024-09-05 19:44 ` Richard Henderson
2024-09-06 0:53 ` Alistair Francis
@ 2024-09-06 1:28 ` Alistair Francis
2 siblings, 0 replies; 5+ messages in thread
From: Alistair Francis @ 2024-09-06 1:28 UTC (permalink / raw)
To: Milan P. Stanić; +Cc: qemu-devel, Peter Maydell
On Fri, Sep 6, 2024 at 1:08 AM Milan P. Stanić <mps@arvanta.net> wrote:
>
> build fails on musl libc (alpine linux) with this error:
>
> ../util/cpuinfo-riscv.c: In function 'cpuinfo_init':
> ../util/cpuinfo-riscv.c:63:21: error: '__NR_riscv_hwprobe' undeclared (first use in this function); did you mean 'riscv_hwprobe'?
> 63 | if (syscall(__NR_riscv_hwprobe, &pair, 1, 0, NULL, 0) == 0
> | ^~~~~~~~~~~~~~~~~~
> | riscv_hwprobe
> ../util/cpuinfo-riscv.c:63:21: note: each undeclared identifier is reported only once for each function it appears in
> ninja: subcommand failed
>
> add '#include "asm/unistd.h"' to util/cpuinfo-riscv.c fixes build
>
> Signed-off-by: Milan P. Stanić <mps@arvanta.net>
Thanks!
Applied to riscv-to-apply.next
Alistair
> ---
> util/cpuinfo-riscv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
> index 497ce12680..8cacc67645 100644
> --- a/util/cpuinfo-riscv.c
> +++ b/util/cpuinfo-riscv.c
> @@ -9,6 +9,7 @@
> #ifdef CONFIG_ASM_HWPROBE_H
> #include <asm/hwprobe.h>
> #include <sys/syscall.h>
> +#include <asm/unistd.h>
> #endif
>
> unsigned cpuinfo;
> --
> 2.46.0
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-06 1:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-05 15:06 [PATCH v2 1/1] util/util/cpuinfo-riscv.c: fix riscv64 build on musl libc Milan P. Stanić
2024-09-05 19:44 ` Richard Henderson
2024-09-05 19:57 ` Peter Maydell
2024-09-06 0:53 ` Alistair Francis
2024-09-06 1:28 ` Alistair Francis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).