Skip to content

[bsp][qemu-virt64-riscv] Allow optional C-only Picolibc builds - #11849

Open
deepai-org wants to merge 1 commit into
RT-Thread:masterfrom
deepai-org:optional-picolibc
Open

deepai-org wants to merge 1 commit into
RT-Thread:masterfrom
deepai-org:optional-picolibc

Conversation

@deepai-org

@deepai-org deepai-org commented Sep 30, 2026 •

Copy link
Copy Markdown

拉取/合并请求描述:(PR description)

为什么提交这份PR (why to submit this PR)

The QEMU RV64 BSP unconditionally links libsupc++, even for a C-only
configuration. This prevents using a C-only GNU/Picolibc toolchain. Selecting
an external Picolibc specs file also currently requires editing rtconfig.py.

你的解决方案是什么 (what is your solution)

  • Accept an optional RTT_PICOLIBC_SPECS environment variable and pass it to
    compilation, assembly and linking. Unset/empty leaves libc selection unchanged.
  • Remove -lsupc++ only when RT_USING_CPLUSPLUS is disabled. C++ configurations
    retain the original linker flags and existing G++ driver selection.

No libc sources, default configuration, ISA/ABI, or other BSPs change.
AI assistance was used to prepare and validate this patch.

请提供验证的bsp和config (provide the config and bsp)

  • BSP: bsp/qemu-virt64-riscv, standard RT-Thread (not RT-Smart).
  • .config: BSP defaults plus RT_USING_UTESTCASES, RT_USING_CI_ACTION,
    UTEST_THR_STACK_SIZE=8192, and RT_UTEST_{TIMER,OBJECT,THREAD,ATOMIC,SCHEDULER,SEMAPHORE,EVENT,MESSAGEQUEUE,MUTEX,MAILBOX}.
    C++ disabled. Built with GNU RV64 GCC 13.2.0 and Picolibc at
    764ef4e401a8f4c6a86ab723533841f072885a5b, configured for lp64, without
    TLS, multilib, picocrt or semihosting. Set RTT_PICOLIBC_SPECS to the
    absolute installed lib/picolibc.specs path, then run
    scons --pyconfig-silent and scons -j4.
  • action: Local ARM64-host build and QEMU validation, not a GitHub Actions run.
    Boot command: qemu-system-riscv64 -nographic -monitor none -M virt -m 256M -smp 1 -bios default -kernel rtthread.bin -nic none.
    All 18 upstream utest cases passed (91 unit invocations), including atomic,
    IPC, scheduler stress, thread and timer cases.
    Separate flag checks covered unset/empty/explicit specs and C++ disabled/enabled;
    default compiler flags and C++ linker flags are preserved. This is not a
    C++ runtime, TLS or RT-Smart validation claim. The build retains the existing
    linker warning about an RWX LOAD segment.

The clang-format and new-BSP checklist items are not applicable: this changes
only two existing Python/SCons build files, not C/C++ sources or a new BSP.

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支(通常为 master)
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 optional-picolibc
    Enter PR branch optional-picolibc in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 optional-picolibc 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the optional-picolibc branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions github-actions Bot added the BSP label Sep 30, 2026
@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.


kevin seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@BernardXiong

Copy link
Copy Markdown
Member

这份PR是完全AI给出的?需要后面的人来认领下

This branch has not been deployed

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants