From 6990d7632a946d038cae75df3435d6f2754a9743 Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Wed, 14 Feb 2018 16:26:40 +0100
Subject: [PATCH] fix(Makefile): Support arm64 / armv8 / aarch64

This adds support for 64bit arm cpu architectures.

Change-Type: patch
Changelog-Entry: Support building Etcher on armv8
---
 Makefile                              |  9 +++++++++
 scripts/build/architecture-convert.sh | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/Makefile b/Makefile
index e0f7326a..0ae55876 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,15 @@ else
 		ifeq ($(shell uname -m),armv7l)
 			HOST_ARCH = armv7hf
 		endif
+		ifeq ($(shell uname -m),aarch64)
+			HOST_ARCH = aarch64
+		endif
+		ifeq ($(shell uname -m),armv8)
+			HOST_ARCH = aarch64
+		endif
+		ifeq ($(shell uname -m),arm64)
+			HOST_ARCH = aarch64
+		endif
 	endif
 	ifeq ($(shell uname -s),Darwin)
 		PLATFORM = darwin
diff --git a/scripts/build/architecture-convert.sh b/scripts/build/architecture-convert.sh
index 493f62af..0ed3c7b8 100755
--- a/scripts/build/architecture-convert.sh
+++ b/scripts/build/architecture-convert.sh
@@ -53,6 +53,8 @@ if [ "$ARGV_TYPE" == "node" ]; then
     RESULT=x64
   elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
     RESULT=arm
+  elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
+    RESULT=arm64
   fi
 elif [ "$ARGV_TYPE" == "electron-builder" ]; then
   if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@@ -61,6 +63,8 @@ elif [ "$ARGV_TYPE" == "electron-builder" ]; then
     RESULT=x64
   elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
     RESULT=armv7l
+  elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
+    RESULT=arm64
   fi
 elif [ "$ARGV_TYPE" == "debian" ]; then
   if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@@ -69,6 +73,8 @@ elif [ "$ARGV_TYPE" == "debian" ]; then
     RESULT=amd64
   elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
     RESULT=armhf
+  elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
+    RESULT=arm64
   fi
 elif [ "$ARGV_TYPE" == "redhat" ]; then
   if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@@ -77,6 +83,8 @@ elif [ "$ARGV_TYPE" == "redhat" ]; then
     RESULT='x86_64'
   elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
     RESULT=armhfp
+  elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
+    RESULT=aarch64
   fi
 elif [ "$ARGV_TYPE" == "appimage" ]; then
   if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@@ -85,6 +93,8 @@ elif [ "$ARGV_TYPE" == "appimage" ]; then
     RESULT='x86_64'
   elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
     RESULT=armhf
+  elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
+    RESULT=arm64
   fi
 elif [ "$ARGV_TYPE" == "docker" ]; then
   if [ "$ARGV_ARCHITECTURE" == "x64" ]; then
@@ -93,6 +103,8 @@ elif [ "$ARGV_TYPE" == "docker" ]; then
     RESULT=i686
   elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
     RESULT=armv7hf
+  elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
+    RESULT=arm64v8
   fi
 else
   echo "Unsupported architecture type: $ARGV_TYPE" 1>&2