ARM architecture support

Tested on Raspberry Pi 2 (Raspbian, Arch Linux) and Raspberry Pi 1 (Arch Linux) with Oracle JDK 8 for ARM.
JetBrains · db531b5f3343fb66509a258b13c543e6445bbbb8 · pavelfatin committed Jun 16, 2015 · Jun 16, 2015 · db531b5
1 parent 35e6989
commit db531b5f3343fb66509a258b13c543e6445bbbb8
Unified Split

Showing with 8 additions and 2 deletions.

BIN bin/linux/fsnotifier-arm

BIN lib/jna.jar

+3 −1 platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java

+5 −1 platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
diff --git a/bin/linux/fsnotifier-arm b/bin/linux/fsnotifier-arm
diff --git a/lib/jna.jar b/lib/jna.jar
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
@@ -194,7 +194,9 @@ private static File getExecutable() {
   private static String getExecutableName(final boolean withSubDir) {
     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 : "") + (SystemInfo.isAMD64 ? "fsnotifier64" : "fsnotifier");
+    else if (SystemInfo.isLinux) return (withSubDir ? "linux" + File.separator : "") +
+                                        ("arm".equals(SystemInfo.OS_ARCH) ? "fsnotifier-arm"
+                                                                          : (SystemInfo.isAMD64 ? "fsnotifier64" : "fsnotifier"));
     return null;
   }
 
diff --git a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
@@ -379,6 +379,7 @@ protected String resolveSymLink(@NotNull final String path) throws Exception {
     private static final int[] LINUX_64 =  {24, 48, 88, 28, 32};
     private static final int[] LNX_PPC32 = {16, 48, 80, 24, 28};
     private static final int[] LNX_PPC64 = LINUX_64;
+    private static final int[] LINUX_ARM = LNX_PPC32;
     private static final int[] BSD_32 =    { 8, 48, 32, 12, 16};
     private static final int[] BSD_64 =    { 8, 72, 40, 12, 16};
     private static final int[] SUN_OS_32 = {20, 48, 64, 28, 32};
@@ -399,7 +400,10 @@ protected String resolveSymLink(@NotNull final String path) throws Exception {
 
     private JnaUnixMediatorImpl() throws Exception {
       if (SystemInfo.isLinux) {
-        if ("ppc".equals(SystemInfo.OS_ARCH)) {
+        if ("arm".equals(SystemInfo.OS_ARCH)) {
+          myOffsets = LINUX_ARM;
+        }
+        else if ("ppc".equals(SystemInfo.OS_ARCH)) {
           myOffsets = SystemInfo.is32Bit ? LNX_PPC32 : LNX_PPC64;
         }
         else {