Skip to content

Add support for linux riscv64 #361

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for linux riscv64 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc65f1d
Add support for linux riscv64
heyujiao99 Aug 7, 2025
2d9b1e5
Merge branch 'master' into riscv64-support
heyujiao99 Sep 12, 2025
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
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/gradlebuild/JniPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ void createPlatforms(PlatformContainer platformContainer) {
addPlatform(platformContainer, "osx_aarch64", "osx", "aarch64");
addPlatform(platformContainer, "linux_amd64", "linux", "amd64");
addPlatform(platformContainer, "linux_aarch64", "linux", "aarch64");
addPlatform(platformContainer, "linux_riscv64", "linux", "riscv64");
addPlatform(platformContainer, "windows_i386", "windows", "i386");
addPlatform(platformContainer, "windows_amd64", "windows", "amd64");
addPlatform(platformContainer, "windows_aarch64", "windows", "aarch64");
Expand All @@ -268,6 +269,7 @@ void createToolChains(NativeToolChainRegistry toolChainRegistry) {
// The core Gradle toolchain for gcc only targets x86 and x86_64 out of the box.
// https://github.com/gradle/gradle/blob/36614ee523e5906ddfa1fed9a5dc00a5addac1b0/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
toolChain.target("linux_aarch64");
toolChain.target("linux_riscv64");
});
}
if (toolChainRegistry.stream().noneMatch(toolChain -> toolChain.getName().equals("clang"))) {
Expand Down
6 changes: 5 additions & 1 deletion buildSrc/src/main/java/gradlebuild/NcursesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class NcursesPlugin extends RuleSource {
if (!os.isLinux()) {
builder.add(NCURSES_5);
} else {
for (String d : ImmutableList.of("/lib", "/lib64", "/lib/x86_64-linux-gnu", "/lib/aarch64-linux-gnu", "/usr/lib")) {
for (String d : ImmutableList.of("/lib", "/lib64", "/lib/x86_64-linux-gnu", "/lib/aarch64-linux-gnu", "/lib/riscv64-linux-gnu", "/usr/lib")) {
File libDir = new File(d);
if (new File(libDir, "libncurses.so.6").isFile() || new File(libDir, "libncursesw.so.6").isFile()) {
builder.add(new NcursesVersion("6"));
Expand All @@ -52,6 +52,8 @@ public class NcursesPlugin extends RuleSource {
addPlatform(platformContainer, "linux_amd64_ncurses6", "linux", "amd64");
addPlatform(platformContainer, "linux_aarch64_ncurses5", "linux", "aarch64");
addPlatform(platformContainer, "linux_aarch64_ncurses6", "linux", "aarch64");
addPlatform(platformContainer, "linux_riscv64_ncurses5", "linux", "riscv64");
addPlatform(platformContainer, "linux_riscv64_ncurses6", "linux", "riscv64");
}

@Mutate void configureBinaries(@Each NativeBinarySpecInternal binarySpec, Collection<NcursesVersion> ncursesVersions) {
Expand Down Expand Up @@ -80,6 +82,8 @@ private boolean isNcursesVersion(NativePlatform targetPlatform, NcursesVersion n
// https://github.com/gradle/gradle/blob/36614ee523e5906ddfa1fed9a5dc00a5addac1b0/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
toolChain.target("linux_aarch64_ncurses5");
toolChain.target("linux_aarch64_ncurses6");
toolChain.target("linux_riscv64_ncurses5");
toolChain.target("linux_riscv64_ncurses6");
});
}

Expand Down
2 changes: 1 addition & 1 deletion native-platform/src/main/java/net/rubygrapefruit/platform/SystemInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
@ThreadSafe
public interface SystemInfo extends NativeIntegration {
enum Architecture { i386, amd64, aarch64 }
enum Architecture { i386, amd64, aarch64, riscv64}

/**
* Returns the name of the kernel for the current operating system.
Expand Down
3 changes: 3 additions & 0 deletions native-platform/src/main/java/net/rubygrapefruit/platform/internal/MutableSystemInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ public Architecture getArchitecture() {
if (machineArchitecture.equals("aarch64") || machineArchitecture.equals("arm64")) {
return Architecture.aarch64;
}
if (machineArchitecture.equals("riscv64")) {
return Architecture.riscv64;
}
throw new NativeException(String.format("Cannot determine architecture from kernel architecture name '%s'.", machineArchitecture));
}

Expand Down
9 changes: 9 additions & 0 deletions native-platform/src/main/java/net/rubygrapefruit/platform/internal/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public static Platform current() {
platform = new Linux32Bit();
} else if (arch.equals("aarch64")) {
platform = new LinuxAarch64();
} else if (arch.equals("riscv64")) {
platform = new LinuxRiscv64();
}
} else if (osName.contains("os x") || osName.contains("darwin")) {
if (arch.equals("i386")) {
Expand Down Expand Up @@ -306,6 +308,13 @@ public String getId() {
}
}

private static class LinuxRiscv64 extends Linux {
@Override
public String getId() {
return "linux-riscv64";
}
}

private abstract static class FreeBSD extends Unix {
@Override
public List<String> getLibraryVariants() {
Expand Down
Loading