From 095b7ec6a4da7a05793191160f8a5b2da9611bfb Mon Sep 17 00:00:00 2001
From: supergrecko <me@supergrecko.com>
Date: Tue, 16 Feb 2021 15:58:46 +0100
Subject: [PATCH 1/2] Add support for Linux under arm64

---
 .github/workflows/gcc.yml |  5 +++++
 build.sh                  | 21 +++++++++++++++++++++
 gradlew                   |  2 +-
 gradlew.bat               | 21 +++------------------
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index 602e521..9816dcf 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -14,6 +14,11 @@ env:
   CI_DEPLOY_PASSWORD: 0
   CI_DEPLOY_MODULE: .
 jobs:
+  linux-arm64:
+    runs-on: ubuntu-16.04
+    container: ubuntu:xenial
+    steps:
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@master
   linux-x86_64:
     runs-on: ubuntu-16.04
     container: centos:6
diff --git a/build.sh b/build.sh
index 6f3ad1f..a349c12 100644
--- a/build.sh
+++ b/build.sh
@@ -17,6 +17,27 @@ mkdir build install
 GCC_INSTALL_PREFIX=$(pwd)/install
 
 case $PLATFORM in
+  linux-arm64)
+    export CC="aarch64-linux-gnu-gcc -fPIC"
+    export CXX="aarch64-linux-gnu-g++ -fPIC"
+
+    cd gcc-$GCC_VERSION
+    ./contrib/download_prerequisites
+    cd ..build
+
+    ../gcc-$GCC_VERSION/configure \
+      --prefix=$GCC_INSTALL_PREFIX \
+      --host=aarch64-linux-gnu \
+      --target=aarch64-linux-gnu \
+      --enable-checking=release \
+      --enable-languages=jit \
+      --enable-host-shared \
+      --disable-boostrap \
+      --disable-multilib \
+      --disable-nls
+      make -j $MAKEJ
+      make install
+    ;;
   linux-x86_64)
     export CC="gcc -m64 -fPIC"
     export CXX="g++ -m64 -fPIC"
diff --git a/gradlew b/gradlew
index fbd7c51..4f906e0 100644
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 5093609..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From ad3f4a4ad660d8c8c3bb7a84a0676ae71e6681e7 Mon Sep 17 00:00:00 2001
From: supergrecko <me@supergrecko.com>
Date: Tue, 16 Feb 2021 16:07:35 +0100
Subject: [PATCH 2/2] Fix typo in build path

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index a349c12..0dd3245 100644
--- a/build.sh
+++ b/build.sh
@@ -23,7 +23,7 @@ case $PLATFORM in
 
     cd gcc-$GCC_VERSION
     ./contrib/download_prerequisites
-    cd ..build
+    cd ../build
 
     ../gcc-$GCC_VERSION/configure \
       --prefix=$GCC_INSTALL_PREFIX \