Use GNU as instead of nasm.

Author: deadalnix

.github/workflows/all_ubuntu.yml

@@ -16,7 +16,7 @@ jobs:
 
         steps:
             - name: Install system dependencies
-              run: sudo apt install nasm lld
+              run: sudo apt install lld
             - name: Install D compiler
               uses: dlang-community/setup-dlang@v1
               with:

README.md

@@ -68,9 +68,7 @@ been tested is to use [Homebrew][40], a package manager for OS X. After
 installing it by following instructions from the web page, run the command
 `brew install llvm11`, followed by `LLVM_CONFIG=llvm-config-11 make` . If you
 are using [MacPorts][41] instead, you can run `sudo port install llvm-11`,
-followed by `LLVM_CONFIG=llvm-config-mp-11 make` . You'll also need a recent
-version of `nasm`; if `nasm` does not recognise the `macho64` output format, try
-upgrading `nasm` to a newer version.
+followed by `LLVM_CONFIG=llvm-config-mp-11 make` .
 
 [40]: http://brew.sh/
 [41]: http://www.macports.org

makefile

@@ -1,20 +1,16 @@
 DMD ?= dmd
-NASM ?= nasm
 RDMD ?= rdmd
+AS ?= as
 
-ARCHFLAG ?= -m64
-DFLAGS = $(ARCHFLAG) -Isrc -w -debug -g
+ARCH ?= $(shell uname -m)
 PLATFORM = $(shell uname -s)
 
+ARCHFLAG ?= -m64
+DFLAGS = $(ARCHFLAG) -Isrc -w -debug -g
 # DFLAGS = $(ARCHFLAG) -w -O -release
 
-# dmd.conf doesn't set the proper -L flags.  
-# Fix it here until dmd installer is updated
-ifeq ($(PLATFORM),Darwin)
-	LD_PATH ?= /Library/D/dmd/lib
-endif
+ASFLAGS ?=
 
-NASMFLAGS ?=
 LDFLAGS ?=
 ifdef LD_PATH
 	override LDFLAGS += $(addprefix -L, $(LD_PATH))
@@ -26,15 +22,12 @@ ifeq ($(PLATFORM),Linux)
 		override LDFLAGS += -fuse-ld=lld
 	endif
 	override LDFLAGS += -lstdc++ -export-dynamic
-	override NASMFLAGS += -f elf64
 endif
 ifeq ($(PLATFORM),Darwin)
 	override LDFLAGS += -lc++ -Wl,-export_dynamic
-	override NASMFLAGS += -f macho64
 endif
 ifeq ($(PLATFORM),FreeBSD)
 	override LDFLAGS += -lc++
-	override NASMFLAGS += -f elf64
 endif
 
 # To make sure make calls all

sdlib/sdrt.mak

@@ -18,11 +18,20 @@ LIBSDRT_OSX_OBJ = $(LIBSDRT_OSX_OBJ_C) $(LIBSDRT_OSX_OBJ_D)
 LIBSDRT_X64_SRC = $(wildcard sdlib/sys/x64/*.asm)
 LIBSDRT_X64_OBJ = $(LIBSDRT_X64_SRC:sdlib/sys/x64/%.asm=obj/x64/%.o)
 
+LIBSDRT_ARM64_SRC = $(wildcard sdlib/sys/arm64/*.asm)
+LIBSDRT_ARM64_OBJ = $(LIBSDRT_X64_SRC:sdlib/sys/arm64/%.asm=obj/arm64/%.o)
+
 COMMON_LIB_DEPS = obj/object.o obj/sdlib/gc.o obj/sdlib/rt.o obj/sdlib/stdc.o \
-	obj/sdlib/sync.o $(LIBSDRT_X64_OBJ)
+	obj/sdlib/sync.o
 LIBSDRT_DEPS = $(COMMON_LIB_DEPS) obj/sdlib/d.o obj/sdlib/sdc.o
 LIBDMDALLOC_DEPS = $(COMMON_LIB_DEPS) obj/sdlib/dmd.o
 
+ifeq ($(ARCH),x86_64)
+	COMMON_LIB_DEPS += $(LIBSDRT_X64_OBJ)
+else ifeq ($(ARCH),arm64)
+	COMMON_LIB_DEPS += $(LIBSDRT_ARM64_OBJ)
+endif
+
 ifeq ($(PLATFORM),Linux)
 	LIBSDRT_DEPS += obj/sdlib/linux.o
 endif
@@ -83,7 +92,7 @@ obj/osx/%.o: sdlib/sys/osx/%.d $(LIBSDRT_OSX_SRC_D) $(SDLIB_DEPS)
 
 obj/x64/%.o: sdlib/sys/x64/%.asm $(LIBSDRT_X64_SRC)
 	@mkdir -p obj/x64
-	$(NASM) -o $@ $< $(NASMFLAGS)
+	$(AS) -o $@ $< $(ASFLAGS)
 
 $(LIBSDRT): $(LIBSDRT_DEPS)
 	@mkdir -p lib

sdlib/sys/x64/save_regs.asm

@@ -1,28 +1,29 @@
-global __sd_gc_push_registers
+.intel_syntax noprefix
+.global __sd_gc_push_registers
 
-section .text
+.section .text
 __sd_gc_push_registers:
-; For some reason, clang seems to use rbp, but gcc rbx (?) so we will do it
-; the clang way and push rbx to the stack as a parameter.
+# For some reason, clang seems to use rbp, but gcc rbx (?) so we will do it
+# the clang way and push rbx to the stack as a parameter.
 	push rbp
 	mov rbp, rsp
-; Not using push to make sure we do not mess up with stack alignement.
-; Also sub + mov is usually faster than push (not that it matter much here).
+# Not using push to make sure we do not mess up with stack alignement.
+# Also sub + mov is usually faster than push (not that it matter much here).
 	sub	rsp, 48
-; Register r12 to r15 are callee saved so can have live values.
-; Other registers are trash or already saved on the stack.
+# Register r12 to r15 are callee saved so can have live values.
+# Other registers are trash or already saved on the stack.
 	mov	[rbp - 8], rbx
 	mov	[rbp - 16], r12
 	mov	[rbp - 24], r13
 	mov	[rbp - 32], r14
 	mov	[rbp - 40], r15
-; While not strictly necessary, it avoids false pointers and make for easier debug.
+# While not strictly necessary, it avoids false pointers and make for easier debug.
 	mov	[rbp - 48], rsp
-; This method is passed a delegate. rdi contains the context as a first argument
-; and rsi, the second argument is the function pointer. rdi do not need any special
-; threatement as it is also the first argument when calling the delegate.
+# This method is passed a delegate. rdi contains the context as a first argument
+# and rsi, the second argument is the function pointer. rdi do not need any special
+# threatement as it is also the first argument when calling the delegate.
 	call rsi
-; rsp and rbp are the only callee saved register we modified, no need to restore others.
+# rsp and rbp are the only callee saved register we modified, no need to restore others.
 	mov rsp, rbp
 	pop rbp
 	ret