Skip to content

[libc] Fix feature check for riscv #145169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2025
Merged

[libc] Fix feature check for riscv #145169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libc/src/__support/macros/properties/cpu_features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@

#if defined(__riscv_flen)
// https://github.com/riscv-non-isa/riscv-c-api-doc/blob/main/src/c-api.adoc
#if (__riscv_flen & 0x10)
#if (__riscv_arch_test && __riscv_zfhmin)
Copy link
Collaborator

@zmodem zmodem Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We hit a compile error after this:

../../third_party/llvm-libc/src/src/__support/macros/properties/cpu_features.h:64:27: error: '__riscv_zfhmin' is not defined, evaluates to 0 [-Werror,-Wundef]
   64 | #if (__riscv_arch_test && __riscv_zfhmin)
      |                           ^

Should it be #if ... defined(__riscv_zfhmin) instead?

Copy link
Member Author

@mikhailramalho mikhailramalho Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess #if defined(__riscv_zfhmin) should work too, does it fix the issue for you?

Copy link
Collaborator

@zmodem zmodem Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have my local build configured for risc-v to confirm, but yes I'm pretty sure that would fix it.

Copy link
Member Author

@mikhailramalho mikhailramalho Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want me to open a PR, or do you prefer to do it yourself?

Copy link
Collaborator

@zmodem zmodem Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much risc-v or llvm-libc experience, so it's probably better if you do it.

Copy link
Collaborator

@zmodem zmodem Jun 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sent #145894 to move this along.

#define LIBC_TARGET_CPU_HAS_RISCV_FPU_HALF
#define LIBC_TARGET_CPU_HAS_FPU_HALF
#endif // LIBC_TARGET_CPU_HAS_RISCV_FPU_HALF
#if (__riscv_flen & 0x20)
#if (__riscv_flen >= 32)
#define LIBC_TARGET_CPU_HAS_RISCV_FPU_FLOAT
#define LIBC_TARGET_CPU_HAS_FPU_FLOAT
#endif // LIBC_TARGET_CPU_HAS_RISCV_FPU_FLOAT
#if (__riscv_flen & 0x40)
#if (__riscv_flen >= 64)
#define LIBC_TARGET_CPU_HAS_RISCV_FPU_DOUBLE
#define LIBC_TARGET_CPU_HAS_FPU_DOUBLE
#endif // LIBC_TARGET_CPU_HAS_RISCV_FPU_DOUBLE
Expand Down
Loading