build for more architectures

.github/workflows/release.yml

@@ -1,147 +1,215 @@
+# SPDX-FileCopyrightText: 2025 William Bell
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 name: Build and Release
 
 on:
   push:
     tags:
-      - '*'    # Trigger on any tag push
+      - '*' # Any tag
 
 jobs:
-  build_and_release:
+  build-linux:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        arch: [x86_64, arm64]
-    runs-on: ${{ matrix.os }}
-
     steps:
-      # Linux
+      - uses: actions/checkout@v3
-      - name: Install build tools (Linux)
-        if: runner.os == 'Linux'
-        run: sudo apt-get update && sudo apt-get install -y flex bison
-
-      # macOS
-      - name: Install build tools (macOS)
-        if: runner.os == 'macOS'
-        run: brew install flex bison
-
-      # Windows
-      - name: Install build tools (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          choco install winflexbison mingw -y
-        shell: pwsh
-
-      - name: Checkout code
-        uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Setup Python (needed for Conan)
+      - name: Install build tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y flex bison make cmake build-essential
+          if [ "${{ matrix.arch }}" = "arm64" ]; then
+            sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+          fi
+
+      - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
-      - name: Install Conan (Linux/macOS)
+      - name: Install Conan
-        if: runner.os != 'Windows'
         run: |
           python -m pip install --upgrade pip
           pip install conan
-        shell: bash
+          conan profile detect
 
-      - name: Install Conan (Windows)
+      - name: Build
-        if: runner.os == 'Windows'
         run: |
-          python -m pip install --upgrade pip
+          BUILD_DIR="build_${{ matrix.arch }}"
-          pip install conan
+          mkdir -p "$BUILD_DIR"
-        shell: pwsh
+          cd "$BUILD_DIR"
 
-      - name: Configure Conan (Linux/macOS)
+          if [ "${{ matrix.arch }}" = "arm64" ]; then
-        if: runner.os != 'Windows'
+            export CC=aarch64-linux-gnu-gcc
-        run: conan profile detect
+            export CXX=aarch64-linux-gnu-g++
-        shell: bash
-
-      - name: Configure Conan (Windows)
-        if: runner.os == 'Windows'
-        run: conan profile detect
-        shell: pwsh
-
-      - name: Install dependencies and build (Linux/macOS)
-        if: runner.os != 'Windows'
-        run: |
-          conan install . --build=missing
-          conan build .
-        shell: bash
-
-      - name: Install dependencies and build (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          conan install . \
-          -s compiler=gcc \
-          -s compiler.version=13 \
-          -s compiler.libcxx=libstdc++11 \
-          -s arch=x86_64 \
-          -s os=Windows \
-          --build=missing
-          conan install . \
-          -s compiler=gcc \
-          -s compiler.version=13 \
-          -s compiler.libcxx=libstdc++11 \
-          -s arch=x86_64 \
-          -s os=Windows \
-          --build=missing
-        shell: pwsh
-
-      - name: Determine if prerelease (Linux/macOS)
-        if: runner.os != 'Windows'
-        id: prerelease_check_unix
-        run: |
-          TAG=${GITHUB_REF##refs/tags/}
-          if [[ "$TAG" == prerelease-* ]]; then
-            echo "true" > prerelease.txt
-          else
-            echo "false" > prerelease.txt
           fi
-          echo "prerelease=$(cat prerelease.txt)" >> $GITHUB_OUTPUT
-        shell: bash
 
-      - name: Determine if prerelease (Windows)
+          conan install .. --build=missing
-        if: runner.os == 'Windows'
+          conan build ..
-        id: prerelease_check_win
-        run: |
-          $TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
-          if ($TAG -like 'prerelease-*') {
-            echo "true" > prerelease.txt
-          } else {
-            echo "false" > prerelease.txt
-          }
-          echo "prerelease=$(Get-Content prerelease.txt)" >> $env:GITHUB_OUTPUT
-        shell: pwsh
 
-      - name: Archive build folder (Linux/macOS)
+          cd ..
-        if: runner.os != 'Windows'
+
+      - name: Package
         run: |
           TAG=${GITHUB_REF##refs/tags/}
-          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+          OS="linux"
-          ARCH=$(uname -m)
+          ARCH="${{ matrix.arch }}"
-          FOLDER_NAME="chloride-$TAG-$OS-$ARCH"
+          FOLDER="chloride-$TAG-$OS-$ARCH"
-          TAR_NAME="$FOLDER_NAME.tar.gz"
+          TAR="$FOLDER.tar.gz"
-          mv build/bin "$FOLDER_NAME"
+          mv build_${ARCH}/bin "$FOLDER"
-          cp LICENSE.txt "$FOLDER_NAME"
+          cp LICENSE.txt "$FOLDER"
-          tar -czf "$TAR_NAME" "$FOLDER_NAME"
+          tar -czf "$TAR" "$FOLDER"
-          echo "TAR_NAME=$TAR_NAME" >> $GITHUB_ENV
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
-        shell: bash
 
-      - name: Archive build folder (Windows)
+      - name: Upload artifact
-        if: runner.os == 'Windows'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-${{ matrix.arch }}-artifact
+          path: ${{ env.TAR_NAME }}
+
+  build-macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        arch: [x86_64, arm64]   # build both architectures
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install build tools
+        run: brew install flex bison
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install Conan
         run: |
-          $TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
+          python -m pip install --upgrade pip
-          $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
+          pip install conan
-          $FOLDER_NAME = "chloride-$TAG-windows-$ARCH"
+          conan profile detect
-          $TAR_NAME = "$FOLDER_NAME.zip"
+
-          Rename-Item build\bin $FOLDER_NAME
+      - name: Build
-          Copy-Item LICENSE.txt $FOLDER_NAME
+        run: |
-          Compress-Archive -Path $FOLDER_NAME -DestinationPath $TAR_NAME
+          # Create a build directory per arch
-          echo "TAR_NAME=$TAR_NAME" >> $env:GITHUB_ENV
+          BUILD_DIR="build_${{ matrix.arch }}"
-        shell: pwsh
+          mkdir -p "$BUILD_DIR"
+          cd "$BUILD_DIR"
+          
+          # Use the matrix architecture for the build
+          export CFLAGS="-arch ${{ matrix.arch }}"
+          export CXXFLAGS="-arch ${{ matrix.arch }}"
+          export LDFLAGS="-arch ${{ matrix.arch }}"
+
+          conan install .. --build=missing
+          conan build ..
+
+          cd ..
+
+      - name: Package
+        run: |
+          TAG=${GITHUB_REF##refs/tags/}
+          OS="macos"
+          ARCH="${{ matrix.arch }}"
+          FOLDER="chloride-$TAG-$OS-$ARCH"
+          TAR="$FOLDER.tar.gz"
+          mv build_${ARCH}/bin "$FOLDER"
+          cp LICENSE.txt "$FOLDER"
+          tar -czf "$TAR" "$FOLDER"
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-${{ matrix.arch }}-artifact
+          path: ${{ env.TAR_NAME }}
+
+  build-windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        arch: [x86_64, arm64]
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: >
+            base-devel
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-make
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-python
+            mingw-w64-x86_64-python-pip
+            msys/flex
+
+      - name: Install Conan
+        run: |
+          python -m pip install --upgrade pip
+          pip install conan
+          conan profile detect
+
+      - name: Build Project
+        run: |
+          BUILD_DIR="build_${{ matrix.arch }}"
+          mkdir -p "$BUILD_DIR"
+          cd "$BUILD_DIR"
+
+          if [ "${{ matrix.arch }}" = "arm64" ]; then
+            # Use the ARM64 cross-compiler
+            export CC=aarch64-w64-mingw32-gcc
+            export CXX=aarch64-w64-mingw32-g++
+          fi
+
+          conan install .. --profile mingw-profile.txt --build=missing
+          conan build .. --profile mingw-profile.txt
+
+          cd ..
+
+      - name: Package
+        run: |
+          TAG=${GITHUB_REF##refs/tags/}
+          OS="windows"
+          ARCH="${{ matrix.arch }}"
+          FOLDER="chloride-$TAG-$OS-$ARCH"
+          ZIP="$FOLDER.zip"
+          mv build_${ARCH}/bin "$FOLDER"
+          cp LICENSE.txt "$FOLDER"
+          powershell Compress-Archive -Path "$FOLDER" -DestinationPath "$ZIP"
+          echo "TAR_NAME=$ZIP" >> $GITHUB_ENV
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-${{ matrix.arch }}-artifact
+          path: ${{ env.TAR_NAME }}
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [build-linux, build-macos, build-windows]
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./artifacts
+          merge-multiple: true
 
       - name: Create GitHub Release
         uses: ncipollo/release-action@v1
@@ -150,7 +218,5 @@ jobs:
           name: Release ${{ github.ref_name }}
           body: Automated release based on tag ${{ github.ref_name }}
           draft: false
-          updateOnlyUnreleased: true
+          prerelease: ${{ startsWith(github.ref_name, 'prerelease-') }}
-          replacesArtifacts: true
+          artifacts: "./artifacts/*"
-          prerelease: ${{ runner.os == 'Windows' && steps.prerelease_check_win.outputs.prerelease || steps.prerelease_check_unix.outputs.prerelease }}
-          artifacts: ${{ env.TAR_NAME }}

CMakeLists.txt

@@ -52,14 +52,12 @@ find_package(BDWgc REQUIRED)
 find_package(gmp REQUIRED)
 
 target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
-if(NOT APPLE)
-    target_link_options(argon PRIVATE -static)
-endif()
 
 target_link_libraries(argon PRIVATE
     BDWgc::BDWgc
     gmp::gmp
     m
+    $<$<PLATFORM_ID:Windows>:bcrypt>
 )
 
 target_include_directories(argon PRIVATE

Makefile

@@ -2,26 +2,43 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# Default FLEX tool
+BINARY = bin/argon
+FLEX_TOOL = flex
+
+CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
+
 LEXER_SRC = src/lexer/lex.l
 LEXER_C = src/lexer/lex.yy.c
 LEXER_H = src/lexer/lex.yy.h
-
-CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
 CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
-BINARY = bin/argon
+LDFLAGS = -lgc -lgmp -lm
+
+ifeq ($(MAKECMDGOALS),windows)
+	LDFLAGS = -Wl,-Bstatic -lgc -lgmp -Wl,-Bdynamic -lm
+endif
 
 all: $(BINARY)
 
+
 $(LEXER_C) $(LEXER_H): $(LEXER_SRC)
-	flex --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
+	$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
 
 $(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
+	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS} -s
+
+windows: $(CFILES) $(LEXER_C) $(LEXER_H)
+	(echo -n "external/xxhash/xxhash.c " ; \
+	 echo -n "external/cwalk/src/cwalk.c " ; \
+	 echo -n "external/libdye/src/dye.c " ; \
+	 find src -name '*.c' -print0 | xargs -0 echo -n) > sources.txt
+	mkdir -p bin
+	gcc -O3 -march=native -o $(BINARY) @sources.txt $(CFLAGS) -lbcrypt
 
 native: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 
 debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
@@ -29,13 +46,13 @@ debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 
 full-debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 
 optimised: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 	${BINARY} rand_test.ar
-	gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 	
 
 clean:

conanfile.py

@@ -30,16 +30,12 @@ class ArgonConan(ConanFile):
         self.folders.generators = "build"
 
     def generate(self):
+        os.environ["CONAN_NON_INTERACTIVE"] = "1"
         tc = CMakeToolchain(self)
 
-        if os.name == "nt":  # Windows
+        flex_path = which("flex")
-            flex_path = which("win_flex") or which("win_flex.exe")
+        if not flex_path:
-            if not flex_path:
+            raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
-                raise Exception("win_flex not found in PATH. Install winflexbison via choco.")
-        else:
-            flex_path = which("flex")
-            if not flex_path:
-                raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
 
         tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
         tc.generate()

mingw-profile.txt

@@ -0,0 +1,12 @@
+[settings]
+os=Windows
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
+arch=x86_64
+build_type=Release
+
+[tool_requires]
+mingw-builds/12.2.0

src/runtime/call/call.c

@@ -16,8 +16,11 @@
 #include <string.h>
 
 #if defined(_WIN32)
-#include <psapi.h>
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602
+#endif
 #include <windows.h>
+#include <psapi.h>
 
 double get_memory_usage_mb() {
   PROCESS_MEMORY_COUNTERS pmc;