Merge pull request #8 from lib-ruby-parser/add-aarch64-apple-darwin-target

Author: iliabylich

.github/workflows/test.yml

@@ -31,21 +31,33 @@ jobs:
             target: x86_64-unknown-linux-gnu
             cc: clang-12
             ar: llvm-ar-12
+            zig: false
             run: make tests/run
 
           - name: test on mac (clang)
             os: macos-latest
             target: x86_64-apple-darwin
             cc: clang
             ar: ar
+            zig: false
             run: |
               $CC --version
               make tests/run
 
+          - name: build for mac m1 (zig)
+            os: macos-latest
+            target: aarch64-apple-darwin
+            cc: zig cc
+            ar: ar
+            zig: true
+            run: |
+              make libruby_parser_c.a
+
           - name: test on windows (msvc)
             os: windows-latest
             target: x86_64-pc-windows-msvc
             cc: cl.exe
+            zig: false
             run: |
               make tests/run
 
@@ -54,6 +66,7 @@ jobs:
             target: x86_64-pc-windows-gnu
             cc: gcc
             ar: ar
+            zig: false
             run: |
               gcc --version
               make tests/run
@@ -63,6 +76,7 @@ jobs:
             target: x86_64-unknown-linux-gnu
             cc: clang-12
             ar: llvm-ar-12
+            zig: false
             run: |
               sudo apt-get update
               sudo apt-get install -y valgrind libtool-bin
@@ -74,6 +88,7 @@ jobs:
             target: x86_64-unknown-linux-gnu
             cc: clang-12
             ar: llvm-ar-12
+            zig: false
             run: ASAN_OPTIONS=detect_leaks=1 CFLAGS="-fsanitize=address" make tests/run
 
     steps:
@@ -104,6 +119,14 @@ jobs:
         if: runner.os == 'Windows'
         run: rm "C:\\Program Files\\Git\\usr\\bin\\link.exe"
 
+      - name: install zig
+        uses: goto-bus-stop/setup-zig@v2
+        if: ${{ matrix.build.zig }}
+
+      - name: install cargo-zigbuild
+        run: cargo install cargo-zigbuild
+        if: ${{ matrix.build.zig }}
+
       - name: codegen
         run: make do-codegen
 

codegen/build.mk

@@ -4,7 +4,7 @@ endef
 
 CODEGEN_EXE = codegen/codegen$(EXE)
 $(CODEGEN_EXE):
-	$(call download_file, https://github.com/lib-ruby-parser/lib-ruby-parser/releases/download/v4.0.2+ruby-3.1.1/codegen-$(TARGET)$(EXE), $@)
+	$(call download_file, https://github.com/lib-ruby-parser/lib-ruby-parser/releases/download/v4.0.2+ruby-3.1.1/$(CODEGEN_ASSET_NAME), $@)
 	chmod +x $(CODEGEN_EXE)
 CLEAN += $(CODEGEN_EXE)
 

ruby-parser-c/build.mk

@@ -3,7 +3,7 @@ RUST_SRCS += ruby-parser-c/src/node.rs
 RUST_SRCS += ruby-parser-c/src/message.rs
 
 ruby-parser-c/lib_ruby_parser_c.$(A): $(RUST_SRCS)
-	RUSTFLAGS="$(RUSTFLAGS)" cargo build $(CARGOFLAGS) --manifest-path ruby-parser-c/Cargo.toml
+	RUSTFLAGS="$(RUSTFLAGS)" $(CARGO_BUILD) $(CARGOFLAGS) --manifest-path ruby-parser-c/Cargo.toml
 	ls -l ruby-parser-c/target/$(TARGET)
 	ls -l ruby-parser-c/target/$(TARGET)/$(RUST_ENV)
 	cp ruby-parser-c/target/$(TARGET)/$(RUST_ENV)/$(STATIC_LIB_FILE) ruby-parser-c/lib_ruby_parser_c.$(A)

scripts/targets/aarch64-apple-darwin.mk

@@ -0,0 +1,39 @@
+$(info Compiling aarch64-apple-darwin target)
+
+O = o
+A = a
+EXE =
+
+STATIC_LIB_FILE = libruby_parser_c.$(A)
+LIST_DEPS = otool -L
+CARGO_BUILD = cargo zigbuild
+
+CFLAGS += -Wall -Wextra -Wpedantic -Weverything -Wdocumentation -g
+# but disable -Wpadded, we inherit Rust layouts
+CFLAGS += -Wno-padded
+# ignore documentation, it has examples of syntax errors on purpose
+CFLAGS += -Wno-documentation-unknown-command
+# we do mix Rust extern C declarations and C tests
+CFLAGS += -Wno-declaration-after-statement
+
+ifeq ($(BUILD_ENV), debug)
+CFLAGS += -O0 -DTEST_ENV
+else
+CFLAGS += -O3
+endif
+
+define add_to_lib
+$(AR) r $(1) $(2)
+endef
+
+define build_c_obj
+$(CC) $(1) $(CFLAGS) -c -o $(2)
+endef
+
+define build_c_exe
+$(CC) $(1) $(CFLAGS) -o $(2)
+endef
+
+BENCHMARK_RUNNER_ASSET_NAME = rust-parser-aarch64-apple-darwin
+CODEGEN_ASSET_NAME = codegen-x86_64-apple-darwin
+

scripts/targets/x86_64-apple-darwin.mk

@@ -6,6 +6,7 @@ EXE =
 
 STATIC_LIB_FILE = libruby_parser_c.$(A)
 LIST_DEPS = otool -L
+CARGO_BUILD = cargo build
 
 CFLAGS += -Wall -Wextra -Wpedantic -Weverything -Wdocumentation -g
 # but disable -Wpadded, we inherit Rust layouts
@@ -34,3 +35,4 @@ $(CC) $(1) $(CFLAGS) -o $(2)
 endef
 
 BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-apple-darwin
+CODEGEN_ASSET_NAME = codegen-x86_64-apple-darwin

scripts/targets/x86_64-pc-windows-gnu.mk

@@ -6,6 +6,7 @@ EXE = .exe
 
 STATIC_LIB_FILE = libruby_parser_c.$(A)
 LIST_DEPS = ldd
+CARGO_BUILD = cargo build
 
 CFLAGS += -Wall -Wextra -g
 # mingw uses a different allocator from Rust?
@@ -31,3 +32,4 @@ $(CC) $(1) $(CFLAGS) -lws2_32 -luserenv -lbcrypt -o $(2)
 endef
 
 BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-pc-windows-gnu.exe
+CODEGEN_ASSET_NAME = codegen-x86_64-pc-windows-msvc.exe

scripts/targets/x86_64-pc-windows-msvc.mk

@@ -6,6 +6,7 @@ EXE = .exe
 
 STATIC_LIB_FILE = ruby_parser_c.$(A)
 LIST_DEPS = dumpbin /dependents
+CARGO_BUILD = cargo build
 
 # /nologo
 CFLAGS += /bigobj /MT /Zi
@@ -29,3 +30,4 @@ $(CC) $(CFLAGS) ws2_32.lib advapi32.lib userenv.lib bcrypt.lib $(1) /link /OUT:$
 endef
 
 BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-pc-windows-msvc.exe
+CODEGEN_ASSET_NAME = codegen-x86_64-pc-windows-msvc.exe

scripts/targets/x86_64-unknown-linux-gnu.mk

@@ -6,6 +6,7 @@ EXE =
 
 STATIC_LIB_FILE = libruby_parser_c.$(A)
 LIST_DEPS = ldd
+CARGO_BUILD = cargo build
 
 CFLAGS += -Wall -Wextra -g -target $(TARGET)
 
@@ -28,3 +29,4 @@ $(CC) $(1) $(CFLAGS) -lpthread -ldl -lm -o $(2)
 endef
 
 BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-unknown-linux-gnu
+CODEGEN_ASSET_NAME = codegen-x86_64-unknown-linux-gnu