fix(risc-v/virt64, cpp): add spaces to fix Wliteral-suffix#10652
Merged
Rbb666 merged 1 commit intoRT-Thread:masterfrom Sep 1, 2025
Merged
fix(risc-v/virt64, cpp): add spaces to fix Wliteral-suffix#10652Rbb666 merged 1 commit intoRT-Thread:masterfrom
Wliteral-suffix#10652Rbb666 merged 1 commit intoRT-Thread:masterfrom
Conversation
📌 Code Review Assignment🏷️ Tag: libcpu_riscvReviewers: @Yaochenger Changed Files (Click to expand)
📊 Current Review Status (Last Updated: 2025-09-01 14:11 CST)
📝 Review Instructions
|
Rbb666
approved these changes
Sep 1, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
拉取/合并请求描述:(PR description)
[
为什么提交这份PR (why to submit this PR)
在编译 bsp/qemu-virt64-riscv 时,我尝试打开了 cpp 支持:
在这一操作过后,编译时遇到了 (1) 一个error 和 (2) 一个warning。这个 PR 是为了解决问题 (2),问题 (1) 的 PR 已在 #10651 分别提出。
问题现象
开启
CONFIG_RT_USING_CPLUSPLUS后,编译报Wliteral-suffix:In file included from /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/common64/cpuport.h:15, from /nfs/home/tanghaojin/rt-thread-3/include/rthw.h:26, from /nfs/home/tanghaojin/rt-thread-3/include/rtatomic.h:14, from /nfs/home/tanghaojin/rt-thread-3/include/rtthread.h:35, from /nfs/home/tanghaojin/rt-thread-3/components/libc/cplusplus/cxx_crt.cpp:11: /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/virt64/opcode.h:32:5: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] 32 | ".insn r "RT_STRINGIFY(opcode)","RT_STRINGIFY(func3)","RT_STRINGIFY(func7)","RT_STRINGIFY(rd)","RT_STRINGIFY(rs1)","RT_STRINGIFY(rs2) | ^ /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/virt64/opcode.h:32:35: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] 32 | ".insn r "RT_STRINGIFY(opcode)","RT_STRINGIFY(func3)","RT_STRINGIFY(func7)","RT_STRINGIFY(rd)","RT_STRINGIFY(rs1)","RT_STRINGIFY(rs2) | ^ /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/virt64/opcode.h:32:57: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] 32 | ".insn r "RT_STRINGIFY(opcode)","RT_STRINGIFY(func3)","RT_STRINGIFY(func7)","RT_STRINGIFY(rd)","RT_STRINGIFY(rs1)","RT_STRINGIFY(rs2) | ^ /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/virt64/opcode.h:32:79: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] 32 | ".insn r "RT_STRINGIFY(opcode)","RT_STRINGIFY(func3)","RT_STRINGIFY(func7)","RT_STRINGIFY(rd)","RT_STRINGIFY(rs1)","RT_STRINGIFY(rs2) | ^ /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/virt64/opcode.h:32:98: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] 32 | ".insn r "RT_STRINGIFY(opcode)","RT_STRINGIFY(func3)","RT_STRINGIFY(func7)","RT_STRINGIFY(rd)","RT_STRINGIFY(rs1)","RT_STRINGIFY(rs2) | ^ /nfs/home/tanghaojin/rt-thread-3/libcpu/risc-v/virt64/opcode.h:32:118: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] 32 | ".insn r "RT_STRINGIFY(opcode)","RT_STRINGIFY(func3)","RT_STRINGIFY(func7)","RT_STRINGIFY(rd)","RT_STRINGIFY(rs1)","RT_STRINGIFY(rs2) |你的解决方案是什么 (what is your solution)
按照 warning 信息,为字符串常量和宏之间添加空格。
请提供验证的bsp和config (provide the config and bsp)
CONFIG_RT_USING_CPLUSPLUS=y]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality:
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up