AArch64 architecture checks

This commit is contained in:
Pavel Fatin
2015-06-18 13:58:41 +02:00
parent fea38a8b79
commit 6708b8a35c
2 changed files with 6 additions and 2 deletions

View File

@@ -195,7 +195,7 @@ public class FileWatcher {
if (SystemInfo.isWindows) return (withSubDir ? "win" + File.separator : "") + "fsnotifier.exe";
else if (SystemInfo.isMac) return (withSubDir ? "mac" + File.separator : "") + "fsnotifier";
else if (SystemInfo.isLinux) return (withSubDir ? "linux" + File.separator : "") +
("arm".equals(SystemInfo.OS_ARCH) ? "fsnotifier-arm"
("arm".equals(SystemInfo.OS_ARCH) ? (SystemInfo.is32Bit ? "fsnotifier-arm" : null)
: (SystemInfo.isAMD64 ? "fsnotifier64" : "fsnotifier"));
return null;
}

View File

@@ -401,7 +401,11 @@ public class FileSystemUtil {
private JnaUnixMediatorImpl() throws Exception {
if (SystemInfo.isLinux) {
if ("arm".equals(SystemInfo.OS_ARCH)) {
myOffsets = LINUX_ARM;
if (SystemInfo.is32Bit) {
myOffsets = LINUX_ARM;
} else {
throw new IllegalStateException("AArch64 architecture is not supported");
}
}
else if ("ppc".equals(SystemInfo.OS_ARCH)) {
myOffsets = SystemInfo.is32Bit ? LNX_PPC32 : LNX_PPC64;