* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 @ 2021-05-27 21:04 Fabrice Fontaine 2021-05-28 6:59 ` Koen Martens 2021-06-10 8:47 ` Peter Korsgaard 0 siblings, 2 replies; 10+ messages in thread From: Fabrice Fontaine @ 2021-05-27 21:04 UTC (permalink / raw) To: buildroot Fixes: - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch new file mode 100644 index 0000000000..ce70ab8f29 --- /dev/null +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch @@ -0,0 +1,37 @@ +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 12:10:28 -0800 +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t + +mutex code uses SYS_futex, which it expects from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +rv32 is using 64bit time_t from get go unlike other 32bit architectures +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 +this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +[Retrieved from: +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + c++/src/kj/mutex.c++ | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ +index c81cead7b..e1594b117 100644 +--- a/c++/src/kj/mutex.c++ ++++ b/c++/src/kj/mutex.c++ +@@ -39,7 +39,13 @@ + + #ifndef SYS_futex + // Missing on Android/Bionic. ++#ifdef __NR_futex + #define SYS_futex __NR_futex ++#elif defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#else ++#error "Need working SYS_futex" ++#endif + #endif + + #ifndef FUTEX_WAIT_PRIVATE -- 2.30.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-27 21:04 [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 Fabrice Fontaine @ 2021-05-28 6:59 ` Koen Martens 2021-05-28 7:11 ` Fabrice Fontaine 2021-06-10 8:47 ` Peter Korsgaard 1 sibling, 1 reply; 10+ messages in thread From: Koen Martens @ 2021-05-28 6:59 UTC (permalink / raw) To: buildroot Hi, Thanks for diving into this. I've had emails about this for months, and briefly looked at it, but never found the time to properly figure it out. I see the patch below is also present upstream. Do you know whether this has already been released or when it will be? Given that this exact patch is also applied upstream, your patch below seems fine to me. Cheers, Koen On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: > Fixes: > - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > > diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > new file mode 100644 > index 0000000000..ce70ab8f29 > --- /dev/null > +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > @@ -0,0 +1,37 @@ > +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.khem@gmail.com> > +Date: Sun, 15 Nov 2020 12:10:28 -0800 > +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t > + > +mutex code uses SYS_futex, which it expects from system C library. > +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) > +rv32 is using 64bit time_t from get go unlike other 32bit architectures > +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 > +this aliases it to NR_futex so that SYS_futex is then defined for rv32 > + > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > +[Retrieved from: > +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > +--- > + c++/src/kj/mutex.c++ | 6 ++++++ > + 1 file changed, 6 insertions(+) > + > +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ > +index c81cead7b..e1594b117 100644 > +--- a/c++/src/kj/mutex.c++ > ++++ b/c++/src/kj/mutex.c++ > +@@ -39,7 +39,13 @@ > + > + #ifndef SYS_futex > + // Missing on Android/Bionic. > ++#ifdef __NR_futex > + #define SYS_futex __NR_futex > ++#elif defined(SYS_futex_time64) > ++#define SYS_futex SYS_futex_time64 > ++#else > ++#error "Need working SYS_futex" > ++#endif > + #endif > + > + #ifndef FUTEX_WAIT_PRIVATE > -- > 2.30.2 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-28 6:59 ` Koen Martens @ 2021-05-28 7:11 ` Fabrice Fontaine 2021-05-28 14:17 ` Arnout Vandecappelle 0 siblings, 1 reply; 10+ messages in thread From: Fabrice Fontaine @ 2021-05-28 7:11 UTC (permalink / raw) To: buildroot Hi Koen, Le ven. 28 mai 2021 ? 09:00, Koen Martens <gmc@sonologic.nl> a ?crit : > > Hi, > > Thanks for diving into this. I've had emails about this for months, and briefly > looked at it, but never found the time to properly figure it out. > > I see the patch below is also present upstream. Do you know whether this has > already been released or when it will be? I don't know when upstream will release a new version. However, after digging through a lot of riscv32 build failures on other packages, I'm not sure that this upstream patch is right anymore. Aliasing SYS_futex to SYS_futex_time64 has been rejected by vlc for example: https://patches.videolan.org/patch/30581/ So another option would be to just disable capnproto on riscv32. > > Given that this exact patch is also applied upstream, your patch below seems fine > to me. > > Cheers, > > Koen > > On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: > > Fixes: > > - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 > > > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > > --- > > ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ > > 1 file changed, 37 insertions(+) > > create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > > > > diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > > new file mode 100644 > > index 0000000000..ce70ab8f29 > > --- /dev/null > > +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > > @@ -0,0 +1,37 @@ > > +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 > > +From: Khem Raj <raj.khem@gmail.com> > > +Date: Sun, 15 Nov 2020 12:10:28 -0800 > > +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t > > + > > +mutex code uses SYS_futex, which it expects from system C library. > > +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) > > +rv32 is using 64bit time_t from get go unlike other 32bit architectures > > +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 > > +this aliases it to NR_futex so that SYS_futex is then defined for rv32 > > + > > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > > +[Retrieved from: > > +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] > > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > > +--- > > + c++/src/kj/mutex.c++ | 6 ++++++ > > + 1 file changed, 6 insertions(+) > > + > > +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ > > +index c81cead7b..e1594b117 100644 > > +--- a/c++/src/kj/mutex.c++ > > ++++ b/c++/src/kj/mutex.c++ > > +@@ -39,7 +39,13 @@ > > + > > + #ifndef SYS_futex > > + // Missing on Android/Bionic. > > ++#ifdef __NR_futex > > + #define SYS_futex __NR_futex > > ++#elif defined(SYS_futex_time64) > > ++#define SYS_futex SYS_futex_time64 > > ++#else > > ++#error "Need working SYS_futex" > > ++#endif > > + #endif > > + > > + #ifndef FUTEX_WAIT_PRIVATE > > -- > > 2.30.2 > > Best Regards, Fabrice ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-28 7:11 ` Fabrice Fontaine @ 2021-05-28 14:17 ` Arnout Vandecappelle 2021-05-28 14:33 ` Fabrice Fontaine 2021-07-02 21:10 ` Alexandre Belloni 0 siblings, 2 replies; 10+ messages in thread From: Arnout Vandecappelle @ 2021-05-28 14:17 UTC (permalink / raw) To: buildroot On 28/05/2021 09:11, Fabrice Fontaine wrote: > Hi Koen, > > Le ven. 28 mai 2021 ? 09:00, Koen Martens <gmc@sonologic.nl> a ?crit : >> >> Hi, >> >> Thanks for diving into this. I've had emails about this for months, and briefly >> looked at it, but never found the time to properly figure it out. >> >> I see the patch below is also present upstream. Do you know whether this has >> already been released or when it will be? > I don't know when upstream will release a new version. > However, after digging through a lot of riscv32 build failures on > other packages, I'm not sure that this upstream patch is right > anymore. > Aliasing SYS_futex to SYS_futex_time64 has been rejected by vlc for example: > https://patches.videolan.org/patch/30581/ That patch looks OK to me: +/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ +#if !defined(SYS_futex) && defined(SYS_futex_time64) +#define SYS_futex SYS_futex_time64 +#endif The comment was "this patch won't work if the userspace ABI uses the 64-bit time_t on a 32-bit ISA that did start with 32-bit time_t" - but that's not true. On a 32-bit ISA that did start with 32-bit time_t, SYS_futex will be defined (or SYS_foo is not properly exported by libc and then SYS_futex_time64 isn't defined either). To be really safe, you should maybe also check that __TIMESIZE == 64 [1] - but that may break on musl or uClibc. Or even better of course would be to patch all code to use the __time64_t instead of time_t everywhere, independent of __TIMESIZE. But even then you'd need fallback to time_t for old libc/kernel. Regards, Arnout [1] https://www.gnu.org/software/libc/manual/html_node/64_002dbit-time-symbol-handling.html > So another option would be to just disable capnproto on riscv32. >> >> Given that this exact patch is also applied upstream, your patch below seems fine >> to me. >> >> Cheers, >> >> Koen >> >> On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: >>> Fixes: >>> - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 >>> >>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>> --- >>> ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ >>> 1 file changed, 37 insertions(+) >>> create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch >>> >>> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch >>> new file mode 100644 >>> index 0000000000..ce70ab8f29 >>> --- /dev/null >>> +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch >>> @@ -0,0 +1,37 @@ >>> +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 >>> +From: Khem Raj <raj.khem@gmail.com> >>> +Date: Sun, 15 Nov 2020 12:10:28 -0800 >>> +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t >>> + >>> +mutex code uses SYS_futex, which it expects from system C library. >>> +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) >>> +rv32 is using 64bit time_t from get go unlike other 32bit architectures >>> +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 >>> +this aliases it to NR_futex so that SYS_futex is then defined for rv32 >>> + >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com> >>> +[Retrieved from: >>> +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] >>> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>> +--- >>> + c++/src/kj/mutex.c++ | 6 ++++++ >>> + 1 file changed, 6 insertions(+) >>> + >>> +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ >>> +index c81cead7b..e1594b117 100644 >>> +--- a/c++/src/kj/mutex.c++ >>> ++++ b/c++/src/kj/mutex.c++ >>> +@@ -39,7 +39,13 @@ >>> + >>> + #ifndef SYS_futex >>> + // Missing on Android/Bionic. >>> ++#ifdef __NR_futex >>> + #define SYS_futex __NR_futex >>> ++#elif defined(SYS_futex_time64) >>> ++#define SYS_futex SYS_futex_time64 >>> ++#else >>> ++#error "Need working SYS_futex" >>> ++#endif >>> + #endif >>> + >>> + #ifndef FUTEX_WAIT_PRIVATE >>> -- >>> 2.30.2 >>> > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-28 14:17 ` Arnout Vandecappelle @ 2021-05-28 14:33 ` Fabrice Fontaine 2021-05-28 15:25 ` Arnout Vandecappelle 2021-07-02 21:10 ` Alexandre Belloni 1 sibling, 1 reply; 10+ messages in thread From: Fabrice Fontaine @ 2021-05-28 14:33 UTC (permalink / raw) To: buildroot Hi Arnout, Le ven. 28 mai 2021 ? 16:17, Arnout Vandecappelle <arnout@mind.be> a ?crit : > > > > On 28/05/2021 09:11, Fabrice Fontaine wrote: > > Hi Koen, > > > > Le ven. 28 mai 2021 ? 09:00, Koen Martens <gmc@sonologic.nl> a ?crit : > >> > >> Hi, > >> > >> Thanks for diving into this. I've had emails about this for months, and briefly > >> looked at it, but never found the time to properly figure it out. > >> > >> I see the patch below is also present upstream. Do you know whether this has > >> already been released or when it will be? > > I don't know when upstream will release a new version. > > However, after digging through a lot of riscv32 build failures on > > other packages, I'm not sure that this upstream patch is right > > anymore. > > Aliasing SYS_futex to SYS_futex_time64 has been rejected by vlc for example: > > https://patches.videolan.org/patch/30581/ > > That patch looks OK to me: > > +/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ > +#if !defined(SYS_futex) && defined(SYS_futex_time64) > +#define SYS_futex SYS_futex_time64 > +#endif > > The comment was "this patch won't work if the userspace ABI uses the > 64-bit time_t on a 32-bit ISA that did start with 32-bit time_t" - but that's > not true. On a 32-bit ISA that did start with 32-bit time_t, SYS_futex will be > defined (or SYS_foo is not properly exported by libc and then SYS_futex_time64 > isn't defined either). > > To be really safe, you should maybe also check that __TIMESIZE == 64 [1] - but > that may break on musl or uClibc. > > Or even better of course would be to patch all code to use the __time64_t > instead of time_t everywhere, independent of __TIMESIZE. But even then you'd > need fallback to time_t for old libc/kernel. Thanks for your feedback, I'll then send a v2 of my patch for vlc to fix the build on riscv32 instead of disabling it. > > > Regards, > Arnout > > > [1] > https://www.gnu.org/software/libc/manual/html_node/64_002dbit-time-symbol-handling.html > > > > > > > So another option would be to just disable capnproto on riscv32. > >> > >> Given that this exact patch is also applied upstream, your patch below seems fine > >> to me. > >> > >> Cheers, > >> > >> Koen > >> > >> On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: > >>> Fixes: > >>> - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 > >>> > >>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > >>> --- > >>> ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ > >>> 1 file changed, 37 insertions(+) > >>> create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>> > >>> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>> new file mode 100644 > >>> index 0000000000..ce70ab8f29 > >>> --- /dev/null > >>> +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>> @@ -0,0 +1,37 @@ > >>> +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 > >>> +From: Khem Raj <raj.khem@gmail.com> > >>> +Date: Sun, 15 Nov 2020 12:10:28 -0800 > >>> +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t > >>> + > >>> +mutex code uses SYS_futex, which it expects from system C library. > >>> +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) > >>> +rv32 is using 64bit time_t from get go unlike other 32bit architectures > >>> +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 > >>> +this aliases it to NR_futex so that SYS_futex is then defined for rv32 > >>> + > >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com> > >>> +[Retrieved from: > >>> +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] > >>> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > >>> +--- > >>> + c++/src/kj/mutex.c++ | 6 ++++++ > >>> + 1 file changed, 6 insertions(+) > >>> + > >>> +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ > >>> +index c81cead7b..e1594b117 100644 > >>> +--- a/c++/src/kj/mutex.c++ > >>> ++++ b/c++/src/kj/mutex.c++ > >>> +@@ -39,7 +39,13 @@ > >>> + > >>> + #ifndef SYS_futex > >>> + // Missing on Android/Bionic. > >>> ++#ifdef __NR_futex > >>> + #define SYS_futex __NR_futex > >>> ++#elif defined(SYS_futex_time64) > >>> ++#define SYS_futex SYS_futex_time64 > >>> ++#else > >>> ++#error "Need working SYS_futex" > >>> ++#endif > >>> + #endif > >>> + > >>> + #ifndef FUTEX_WAIT_PRIVATE > >>> -- > >>> 2.30.2 > >>> > > Best Regards, > > > > Fabrice > > _______________________________________________ > > buildroot mailing list > > buildroot at busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > Best Regards, Fabrice ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-28 14:33 ` Fabrice Fontaine @ 2021-05-28 15:25 ` Arnout Vandecappelle 2021-05-28 15:26 ` Fabrice Fontaine 0 siblings, 1 reply; 10+ messages in thread From: Arnout Vandecappelle @ 2021-05-28 15:25 UTC (permalink / raw) To: buildroot On 28/05/2021 16:33, Fabrice Fontaine wrote: > Hi Arnout, > > Le ven. 28 mai 2021 ? 16:17, Arnout Vandecappelle <arnout@mind.be> a ?crit : >> >> >> >> On 28/05/2021 09:11, Fabrice Fontaine wrote: >>> Hi Koen, >>> >>> Le ven. 28 mai 2021 ? 09:00, Koen Martens <gmc@sonologic.nl> a ?crit : >>>> >>>> Hi, >>>> >>>> Thanks for diving into this. I've had emails about this for months, and briefly >>>> looked at it, but never found the time to properly figure it out. >>>> >>>> I see the patch below is also present upstream. Do you know whether this has >>>> already been released or when it will be? >>> I don't know when upstream will release a new version. >>> However, after digging through a lot of riscv32 build failures on >>> other packages, I'm not sure that this upstream patch is right >>> anymore. >>> Aliasing SYS_futex to SYS_futex_time64 has been rejected by vlc for example: >>> https://patches.videolan.org/patch/30581/ >> >> That patch looks OK to me: >> >> +/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ >> +#if !defined(SYS_futex) && defined(SYS_futex_time64) >> +#define SYS_futex SYS_futex_time64 >> +#endif >> >> The comment was "this patch won't work if the userspace ABI uses the >> 64-bit time_t on a 32-bit ISA that did start with 32-bit time_t" - but that's >> not true. On a 32-bit ISA that did start with 32-bit time_t, SYS_futex will be >> defined (or SYS_foo is not properly exported by libc and then SYS_futex_time64 >> isn't defined either). >> >> To be really safe, you should maybe also check that __TIMESIZE == 64 [1] - but >> that may break on musl or uClibc. >> >> Or even better of course would be to patch all code to use the __time64_t >> instead of time_t everywhere, independent of __TIMESIZE. But even then you'd >> need fallback to time_t for old libc/kernel. > Thanks for your feedback, I'll then send a v2 of my patch for vlc to > fix the build on riscv32 instead of disabling it. Well, no, only if upstream vlc is going to accept that approach. Regards, Arnout >> >> >> Regards, >> Arnout >> >> >> [1] >> https://www.gnu.org/software/libc/manual/html_node/64_002dbit-time-symbol-handling.html >> >> >> >> >> >>> So another option would be to just disable capnproto on riscv32. >>>> >>>> Given that this exact patch is also applied upstream, your patch below seems fine >>>> to me. >>>> >>>> Cheers, >>>> >>>> Koen >>>> >>>> On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: >>>>> Fixes: >>>>> - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 >>>>> >>>>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>>>> --- >>>>> ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ >>>>> 1 file changed, 37 insertions(+) >>>>> create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch >>>>> >>>>> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch >>>>> new file mode 100644 >>>>> index 0000000000..ce70ab8f29 >>>>> --- /dev/null >>>>> +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch >>>>> @@ -0,0 +1,37 @@ >>>>> +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 >>>>> +From: Khem Raj <raj.khem@gmail.com> >>>>> +Date: Sun, 15 Nov 2020 12:10:28 -0800 >>>>> +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t >>>>> + >>>>> +mutex code uses SYS_futex, which it expects from system C library. >>>>> +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) >>>>> +rv32 is using 64bit time_t from get go unlike other 32bit architectures >>>>> +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 >>>>> +this aliases it to NR_futex so that SYS_futex is then defined for rv32 >>>>> + >>>>> +Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>>> +[Retrieved from: >>>>> +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] >>>>> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>>>> +--- >>>>> + c++/src/kj/mutex.c++ | 6 ++++++ >>>>> + 1 file changed, 6 insertions(+) >>>>> + >>>>> +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ >>>>> +index c81cead7b..e1594b117 100644 >>>>> +--- a/c++/src/kj/mutex.c++ >>>>> ++++ b/c++/src/kj/mutex.c++ >>>>> +@@ -39,7 +39,13 @@ >>>>> + >>>>> + #ifndef SYS_futex >>>>> + // Missing on Android/Bionic. >>>>> ++#ifdef __NR_futex >>>>> + #define SYS_futex __NR_futex >>>>> ++#elif defined(SYS_futex_time64) >>>>> ++#define SYS_futex SYS_futex_time64 >>>>> ++#else >>>>> ++#error "Need working SYS_futex" >>>>> ++#endif >>>>> + #endif >>>>> + >>>>> + #ifndef FUTEX_WAIT_PRIVATE >>>>> -- >>>>> 2.30.2 >>>>> >>> Best Regards, >>> >>> Fabrice >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at busybox.net >>> http://lists.busybox.net/mailman/listinfo/buildroot >>> > Best Regards, > > Fabrice > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-28 15:25 ` Arnout Vandecappelle @ 2021-05-28 15:26 ` Fabrice Fontaine 0 siblings, 0 replies; 10+ messages in thread From: Fabrice Fontaine @ 2021-05-28 15:26 UTC (permalink / raw) To: buildroot Le ven. 28 mai 2021 ? 17:25, Arnout Vandecappelle <arnout@mind.be> a ?crit : > > > > On 28/05/2021 16:33, Fabrice Fontaine wrote: > > Hi Arnout, > > > > Le ven. 28 mai 2021 ? 16:17, Arnout Vandecappelle <arnout@mind.be> a ?crit : > >> > >> > >> > >> On 28/05/2021 09:11, Fabrice Fontaine wrote: > >>> Hi Koen, > >>> > >>> Le ven. 28 mai 2021 ? 09:00, Koen Martens <gmc@sonologic.nl> a ?crit : > >>>> > >>>> Hi, > >>>> > >>>> Thanks for diving into this. I've had emails about this for months, and briefly > >>>> looked at it, but never found the time to properly figure it out. > >>>> > >>>> I see the patch below is also present upstream. Do you know whether this has > >>>> already been released or when it will be? > >>> I don't know when upstream will release a new version. > >>> However, after digging through a lot of riscv32 build failures on > >>> other packages, I'm not sure that this upstream patch is right > >>> anymore. > >>> Aliasing SYS_futex to SYS_futex_time64 has been rejected by vlc for example: > >>> https://patches.videolan.org/patch/30581/ > >> > >> That patch looks OK to me: > >> > >> +/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ > >> +#if !defined(SYS_futex) && defined(SYS_futex_time64) > >> +#define SYS_futex SYS_futex_time64 > >> +#endif > >> > >> The comment was "this patch won't work if the userspace ABI uses the > >> 64-bit time_t on a 32-bit ISA that did start with 32-bit time_t" - but that's > >> not true. On a 32-bit ISA that did start with 32-bit time_t, SYS_futex will be > >> defined (or SYS_foo is not properly exported by libc and then SYS_futex_time64 > >> isn't defined either). > >> > >> To be really safe, you should maybe also check that __TIMESIZE == 64 [1] - but > >> that may break on musl or uClibc. > >> > >> Or even better of course would be to patch all code to use the __time64_t > >> instead of time_t everywhere, independent of __TIMESIZE. But even then you'd > >> need fallback to time_t for old libc/kernel. > > Thanks for your feedback, I'll then send a v2 of my patch for vlc to > > fix the build on riscv32 instead of disabling it. > > Well, no, only if upstream vlc is going to accept that approach. OK, then feel free to apply v1 ;-) > > Regards, > Arnout > > >> > >> > >> Regards, > >> Arnout > >> > >> > >> [1] > >> https://www.gnu.org/software/libc/manual/html_node/64_002dbit-time-symbol-handling.html > >> > >> > >> > >> > >> > >>> So another option would be to just disable capnproto on riscv32. > >>>> > >>>> Given that this exact patch is also applied upstream, your patch below seems fine > >>>> to me. > >>>> > >>>> Cheers, > >>>> > >>>> Koen > >>>> > >>>> On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: > >>>>> Fixes: > >>>>> - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 > >>>>> > >>>>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > >>>>> --- > >>>>> ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ > >>>>> 1 file changed, 37 insertions(+) > >>>>> create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>>>> > >>>>> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>>>> new file mode 100644 > >>>>> index 0000000000..ce70ab8f29 > >>>>> --- /dev/null > >>>>> +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>>>> @@ -0,0 +1,37 @@ > >>>>> +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 > >>>>> +From: Khem Raj <raj.khem@gmail.com> > >>>>> +Date: Sun, 15 Nov 2020 12:10:28 -0800 > >>>>> +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t > >>>>> + > >>>>> +mutex code uses SYS_futex, which it expects from system C library. > >>>>> +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) > >>>>> +rv32 is using 64bit time_t from get go unlike other 32bit architectures > >>>>> +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 > >>>>> +this aliases it to NR_futex so that SYS_futex is then defined for rv32 > >>>>> + > >>>>> +Signed-off-by: Khem Raj <raj.khem@gmail.com> > >>>>> +[Retrieved from: > >>>>> +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] > >>>>> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > >>>>> +--- > >>>>> + c++/src/kj/mutex.c++ | 6 ++++++ > >>>>> + 1 file changed, 6 insertions(+) > >>>>> + > >>>>> +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ > >>>>> +index c81cead7b..e1594b117 100644 > >>>>> +--- a/c++/src/kj/mutex.c++ > >>>>> ++++ b/c++/src/kj/mutex.c++ > >>>>> +@@ -39,7 +39,13 @@ > >>>>> + > >>>>> + #ifndef SYS_futex > >>>>> + // Missing on Android/Bionic. > >>>>> ++#ifdef __NR_futex > >>>>> + #define SYS_futex __NR_futex > >>>>> ++#elif defined(SYS_futex_time64) > >>>>> ++#define SYS_futex SYS_futex_time64 > >>>>> ++#else > >>>>> ++#error "Need working SYS_futex" > >>>>> ++#endif > >>>>> + #endif > >>>>> + > >>>>> + #ifndef FUTEX_WAIT_PRIVATE > >>>>> -- > >>>>> 2.30.2 > >>>>> > >>> Best Regards, > >>> > >>> Fabrice > >>> _______________________________________________ > >>> buildroot mailing list > >>> buildroot at busybox.net > >>> http://lists.busybox.net/mailman/listinfo/buildroot > >>> > > Best Regards, > > > > Fabrice > > Best Regards, Fabrice ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-28 14:17 ` Arnout Vandecappelle 2021-05-28 14:33 ` Fabrice Fontaine @ 2021-07-02 21:10 ` Alexandre Belloni 2021-07-03 12:21 ` Arnout Vandecappelle 1 sibling, 1 reply; 10+ messages in thread From: Alexandre Belloni @ 2021-07-02 21:10 UTC (permalink / raw) To: buildroot Hi, I'm very late to the pary but this patch should not be applied, in BR or upstream. On 28/05/2021 16:17:03+0200, Arnout Vandecappelle wrote: > That patch looks OK to me: > > +/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ > +#if !defined(SYS_futex) && defined(SYS_futex_time64) > +#define SYS_futex SYS_futex_time64 > +#endif > > The comment was "this patch won't work if the userspace ABI uses the > 64-bit time_t on a 32-bit ISA that did start with 32-bit time_t" - but that's > not true. On a 32-bit ISA that did start with 32-bit time_t, SYS_futex will be > defined (or SYS_foo is not properly exported by libc and then SYS_futex_time64 > isn't defined either). > > To be really safe, you should maybe also check that __TIMESIZE == 64 [1] - but > that may break on musl or uClibc. > Not defining __NR_futex was done on purpose, to ensure applications would break at compile time. With that patch applied, you make it harder to properly fix and provide an upgrade path for 32b platforms that had a 32b time_t. The whole goal was to have the applications check sizeof(time_t). The patch works but it is hiding the issue under the rug and everything will break silently in 2038 instead of breaking now at compile time. > Or even better of course would be to patch all code to use the __time64_t > instead of time_t everywhere, independent of __TIMESIZE. But even then you'd > need fallback to time_t for old libc/kernel. > Exactly, the solution, is simply to check sizeof(time_t). > > Regards, > Arnout > > > [1] > https://www.gnu.org/software/libc/manual/html_node/64_002dbit-time-symbol-handling.html > > > > > > > So another option would be to just disable capnproto on riscv32. > >> > >> Given that this exact patch is also applied upstream, your patch below seems fine > >> to me. > >> > >> Cheers, > >> > >> Koen > >> > >> On Thu, May 27, 2021 at 11:04:02PM +0200, Fabrice Fontaine wrote: > >>> Fixes: > >>> - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 > >>> > >>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > >>> --- > >>> ...it-architectures-using-64-bit-time_t.patch | 37 +++++++++++++++++++ > >>> 1 file changed, 37 insertions(+) > >>> create mode 100644 package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>> > >>> diff --git a/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>> new file mode 100644 > >>> index 0000000000..ce70ab8f29 > >>> --- /dev/null > >>> +++ b/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch > >>> @@ -0,0 +1,37 @@ > >>> +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 > >>> +From: Khem Raj <raj.khem@gmail.com> > >>> +Date: Sun, 15 Nov 2020 12:10:28 -0800 > >>> +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t > >>> + > >>> +mutex code uses SYS_futex, which it expects from system C library. > >>> +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) > >>> +rv32 is using 64bit time_t from get go unlike other 32bit architectures > >>> +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 > >>> +this aliases it to NR_futex so that SYS_futex is then defined for rv32 > >>> + > >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com> > >>> +[Retrieved from: > >>> +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] > >>> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > >>> +--- > >>> + c++/src/kj/mutex.c++ | 6 ++++++ > >>> + 1 file changed, 6 insertions(+) > >>> + > >>> +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ > >>> +index c81cead7b..e1594b117 100644 > >>> +--- a/c++/src/kj/mutex.c++ > >>> ++++ b/c++/src/kj/mutex.c++ > >>> +@@ -39,7 +39,13 @@ > >>> + > >>> + #ifndef SYS_futex > >>> + // Missing on Android/Bionic. > >>> ++#ifdef __NR_futex > >>> + #define SYS_futex __NR_futex > >>> ++#elif defined(SYS_futex_time64) > >>> ++#define SYS_futex SYS_futex_time64 > >>> ++#else > >>> ++#error "Need working SYS_futex" > >>> ++#endif > >>> + #endif > >>> + > >>> + #ifndef FUTEX_WAIT_PRIVATE > >>> -- > >>> 2.30.2 > >>> > > Best Regards, > > > > Fabrice > > _______________________________________________ > > buildroot mailing list > > buildroot at busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-07-02 21:10 ` Alexandre Belloni @ 2021-07-03 12:21 ` Arnout Vandecappelle 0 siblings, 0 replies; 10+ messages in thread From: Arnout Vandecappelle @ 2021-07-03 12:21 UTC (permalink / raw) To: buildroot On 02/07/2021 23:10, Alexandre Belloni wrote: > Hi, > > I'm very late to the pary but this patch should not be applied, in BR or > upstream. > > On 28/05/2021 16:17:03+0200, Arnout Vandecappelle wrote: >> That patch looks OK to me: >> >> +/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */ >> +#if !defined(SYS_futex) && defined(SYS_futex_time64) >> +#define SYS_futex SYS_futex_time64 >> +#endif >> >> The comment was "this patch won't work if the userspace ABI uses the >> 64-bit time_t on a 32-bit ISA that did start with 32-bit time_t" - but that's >> not true. On a 32-bit ISA that did start with 32-bit time_t, SYS_futex will be >> defined (or SYS_foo is not properly exported by libc and then SYS_futex_time64 >> isn't defined either). >> >> To be really safe, you should maybe also check that __TIMESIZE == 64 [1] - but >> that may break on musl or uClibc. >> > > Not defining __NR_futex was done on purpose, to ensure applications > would break at compile time. With that patch applied, you make it harder > to properly fix and provide an upgrade path for 32b platforms that had a > 32b time_t. That's a good reasoning for not accepting the patch in upstream capnproto, but I don't see this as a problem for Buildroot. I *think* your point is that capnproto is broken for 32-bit platforms with a libc that sets TIMESIZE to 64 - but that was already broken before this patch, the patch just doesn't fix it. I still claim that this fix is acceptable to support 32-bit platforms that never had 32-bit time_t. Even then though - if libc sets TIMESIZE to 64, I would expect it will also undef SYS_futex, no? So the patch actually still works, because SYS_futex_time64 would be used like it should be. Can you give a concrete example of when it breaks? > The whole goal was to have the applications check > sizeof(time_t). > The patch works but it is hiding the issue under the rug > and everything will break silently in 2038 instead of breaking now at > compile time. > >> Or even better of course would be to patch all code to use the __time64_t >> instead of time_t everywhere, independent of __TIMESIZE. But even then you'd >> need fallback to time_t for old libc/kernel. >> > > Exactly, the solution, is simply to check sizeof(time_t). I don't get how that should be done (can't use sizeof in a #if as far as I know), but I'm sure you'll point me to the patch you sent to capnproto that shows it :-) Regards, Arnout ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 2021-05-27 21:04 [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 Fabrice Fontaine 2021-05-28 6:59 ` Koen Martens @ 2021-06-10 8:47 ` Peter Korsgaard 1 sibling, 0 replies; 10+ messages in thread From: Peter Korsgaard @ 2021-06-10 8:47 UTC (permalink / raw) To: buildroot >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fixes: > - http://autobuild.buildroot.org/results/1c1cd4775241ee57d878cad5c978413d4b4a8736 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2021.02.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-07-03 12:21 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-27 21:04 [Buildroot] [PATCH 1/1] package/capnproto: fix build on riscv32 Fabrice Fontaine 2021-05-28 6:59 ` Koen Martens 2021-05-28 7:11 ` Fabrice Fontaine 2021-05-28 14:17 ` Arnout Vandecappelle 2021-05-28 14:33 ` Fabrice Fontaine 2021-05-28 15:25 ` Arnout Vandecappelle 2021-05-28 15:26 ` Fabrice Fontaine 2021-07-02 21:10 ` Alexandre Belloni 2021-07-03 12:21 ` Arnout Vandecappelle 2021-06-10 8:47 ` Peter Korsgaard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.