Merge pull request #73 from martin-g/support-for-linux-aarch64

Support for Linux aarch64
rcedgar · Mar 20, 2024 · a42226d · a42226d
2 parents 26d8651 + 189f8c5
commit a42226d
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -1,16 +1,31 @@
 name: build_linux
 
 on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
   # Enable manual run from the Actions tab
   workflow_dispatch:
 
+permissions:
+  contents: read    
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+
 jobs:
   build:
+    name: Linux x86_64
     runs-on: ubuntu-20.04
 
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # Runs a set of commands using the runners shell
       - name: Build-commands
@@ -21,9 +36,44 @@ jobs:
           cd $GITHUB_WORKSPACE
           ls -lh
           cd src
-          make LDFLAGS2=-static
+          make -j LDFLAGS2=-static
+          file Linux/muscle | grep x86-64
       - name: Upload binary artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: muscle-linux-binary
           path: src/Linux/muscle
+
+  build-aarch64:
+    name: Linux aarch64
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Build
+      uses: uraimo/run-on-arch-action@v2
+      with:
+        arch: aarch64
+        distro: ubuntu20.04
+        githubToken: ${{ github.token }}
+        dockerRunArgs: |
+          --volume "${PWD}:/muscle"
+        install: |
+          apt-get update -q -y
+          apt-get install -q -y make g++ file git
+        run: |
+          git config --global --add safe.directory /muscle
+          cd /muscle  
+          uname -a
+          lscpu
+          cd src/
+          make -j LDFLAGS2=-static 
+          file Linux/muscle | grep aarch64
+
+    - name: Upload binary artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: muscle-linux-aarch64-binary
+        path: src/Linux/muscle
+
diff --git a/src/myutils.h b/src/myutils.h
@@ -11,7 +11,7 @@
 #define TRACK_ALLOC		0
 #define ALLOC_TOTALS	0
 
-#if defined(__x86_64__) || defined(_M_X64) || defined(__arm64__)
+#if defined(__x86_64__) || defined(_M_X64) || defined(__arm64__) || defined(__aarch64__)
 #define	BITS			64
 #else
 #define	BITS			32