Re: [PATCH 0/2] tools/nolibc: riscv: Fix up compile error for rv32

[Willy Tarreau]

Hi Thomas,

On Sat, May 20, 2023 at 09:18:25AM +0200, Thomas Weißschuh wrote:
> On 2023-05-19 12:19:10+0200, Willy Tarreau wrote:
> > On Fri, May 19, 2023 at 12:11:00PM +0200, Thomas Weißschuh wrote:
> > > Hi Willy,
> > > 
> > > On 2023-05-19 11:40:30+0200, Willy Tarreau wrote:
> > > > Hi Zhangjin,
> > > > 
> > > > On Fri, May 19, 2023 at 01:00:18AM +0800, Zhangjin Wu wrote:
> > > > > Hi, Willy
> > > > > 
> > > > > nolibc for riscv is only tested for rv64 currently (see
> > > > > tools/testing/selftests/nolibc/Makefile), this patchset tries to let it
> > > > > compile for rv32, but still not pass the nolibc selftest:
> > > > > 
> > > > > * The first patch uses lw/sw instead of ld/sd for rv32 and verse-vice for rv64
> > > > >     * This patch may conflict with the stackprotector patch [1], because
> > > > >       both of them changed the _start assembly in arch-riscv.h
> > > > 
> > > > That's quite embarrassing, I'm having to trace of that series here. Now
> > > > I can find it in my LKML archives, but I don't have the direct message and
> > > > didn't spot the other ones. I'll have to investigate, thanks for notifying
> > > > me! I'm CCing Thomas, I will check with him how to best merge the two.
> > > 
> > > I think the conflict should be trivial to fix.
> > > 
> > > I can also resend my series or just the single riscv patch.
> > 
> > OK then I'll pick Zhangjin's series and will apply yours on top of it.
> > Do not bother resending the whole series, only the riscv patch will be
> > sufficient, I have the rest of your series in my lkml mbox.
> 
> Could you let me know if or when your are publishing your integration
> branch?

Just finished it now, I had to manually rebase all patches and had to
interrupt it yesterday. You'll find it here:

   https://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git 20230520-nolibc-rv32+stkp

It contains a temporary series made of:
  - Zhangjin's RV32 patches
  - your syscall() patch
  - your stkp series except the riscv one

so that you just need to update the riscv one and that will be fine. Be
careful, I have *not* restested the riscv port. As usual, do not hesitate
to le me know if I messed up with anything.

Thanks!
Willy