Skip to content

Conversation

@no1wudi
Copy link
Contributor

@no1wudi no1wudi commented Dec 26, 2021

Summary

Refine risc-v Toolchain.defs firstly, and it tested on qemu-rv32.
And then:

  1. Apply new Toolchain.defs to all risc-v based chips
  2. Merge the common src for rv32/rv64 (riscv_syscall.S/riscv_fpu.S etc, in rv32im and rv64gc)
  3. Apply new common src to qemu-rv32 and qemu-rv64
  4. Migrate all risc-v based chips to new implementation and remove old

Impact

Refactor only.

Testing

Tested on qemu-rv32 and CI

@xiaoxiang781216
Copy link
Contributor

Look like we should finish this PR: #2822

@no1wudi no1wudi force-pushed the rv branch 7 times, most recently from ee35c1b to 049cfaf Compare December 27, 2021 06:09
@no1wudi
Copy link
Contributor Author

no1wudi commented Dec 27, 2021

Look like we should finish this PR: #2822

This PR will be finished in next phase, I will pick it later.

@no1wudi
Copy link
Contributor Author

no1wudi commented Dec 27, 2021

Waiting for #5082 , and this patch will be rebased on it.

@no1wudi no1wudi force-pushed the rv branch 3 times, most recently from 84b171d to 891bc7e Compare December 27, 2021 13:57
@xiaoxiang781216
Copy link
Contributor

@no1wudi there are some build error need to fix first.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Copy link
Contributor Author

no1wudi commented Dec 28, 2021

@no1wudi there are some build error need to fix first.

Fixed

@xiaoxiang781216 xiaoxiang781216 merged commit c2e8c92 into apache:master Dec 28, 2021
@normanr
Copy link
Contributor

normanr commented Dec 28, 2021

This is giving me:

$ make menuconfig
/home/normanr/src/nuttx/nuttx/tools/../Make.defs:23: /home/normanr/src/nuttx/nuttx/tools/../arch/risc-v/src/rv32im/Toolchain.defs: No such file or directory
make: *** No rule to make target '/home/normanr/src/nuttx/nuttx/tools/../arch/risc-v/src/rv32im/Toolchain.defs'.  Stop.
/home/normanr/src/nuttx/nuttx/Make.defs:23: /home/normanr/src/nuttx/nuttx/arch/risc-v/src/rv32im/Toolchain.defs: No such file or directory
make: *** No rule to make target '/home/normanr/src/nuttx/nuttx/arch/risc-v/src/rv32im/Toolchain.defs'.  Stop.

Is there anything special I need to do to clear out old state? I just tried make menuconfig and make.

@xiaoxiang781216
Copy link
Contributor

This patch merge Toolchain.defs from rv32im/rv64gc to common, so you may need make distclean and reconfigure again.

@normanr
Copy link
Contributor

normanr commented Dec 28, 2021

I couldn't run make distclean because of the same reason, also deleting it broke things worse. I had to re-copy the Make.defs from the arch directory, and that fixed things.

@xiaoxiang781216
Copy link
Contributor

Yes, copy Mak.defs can fix this problem too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants