From 04d1bb2ae8fff758ef14816b9a0d1ccab5ca2088 Mon Sep 17 00:00:00 2001
From: hedgecrw85 <will.hedgecock@fazecast.com>
Date: Wed, 28 Aug 2019 20:16:47 -0500
Subject: [PATCH] Check for sun.arch.data.model property when determining
 architecture on armv8

---
 src/main/java/com/fazecast/jSerialComm/SerialPort.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/fazecast/jSerialComm/SerialPort.java b/src/main/java/com/fazecast/jSerialComm/SerialPort.java
index 4a732bb..2dfedca 100644
--- a/src/main/java/com/fazecast/jSerialComm/SerialPort.java
+++ b/src/main/java/com/fazecast/jSerialComm/SerialPort.java
@@ -152,7 +152,8 @@ public final class SerialPort
 				if (libraryPath.isEmpty())
 					libraryPath = "Linux/armv6";
 				else if (libraryPath.contains("Linux/armv8"))
-					libraryPath += (System.getProperty("os.arch").indexOf("64") >= 0) ? "_64" : "_32";
+					libraryPath += ((System.getProperty("sun.arch.data.model") != null) ? ("_" + System.getProperty("sun.arch.data.model")) :
+						((System.getProperty("os.arch").indexOf("64") >= 0) ? "_64" : "_32"));
 				else
 				{
 					try