diff --git a/Makefile.inc b/Makefile.inc
index a7854fcd9a..3b662ef097 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -424,24 +424,30 @@ gitconfig:
 	git config remote.origin.push HEAD:refs/for/master
 	(git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
 
-crossgcc: crossgcc-i386 crossgcc-arm
+crossgcc: crossgcc-i386 crossgcc-arm crossgcc-aarch64
 
-.PHONY: crossgcc-i386 crossgcc-arm
+.PHONY: crossgcc-i386 crossgcc-arm crossgcc-aarch64
 crossgcc-i386: clean-for-update
 	$(MAKE) -C util/crossgcc build-i386-without-gdb
 
 crossgcc-arm: clean-for-update
 	$(MAKE) -C util/crossgcc build-armv7a-without-gdb
 
+crossgcc-aarch64: clean-for-update
+	$(MAKE) -C util/crossgcc build-aarch64-without-gdb
+
 crosstools: crosstools-i386
 
-.PHONY: crosstools-i386 crosstools-arm
+.PHONY: crosstools-i386 crosstools-arm crosstools-aarch64
 crosstools-i386: clean-for-update
 	$(MAKE) -C util/crossgcc build-i386
 
 crosstools-arm: clean-for-update
 	$(MAKE) -C util/crossgcc build-armv7a
 
+crosstools-aarch64: clean-for-update
+	$(MAKE) -C util/crossgcc build-aarch64
+
 crossgcc-clean: clean-for-update
 	$(MAKE) -C util/crossgcc clean
 
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index 14ca1ecf7e..bd7fa2f777 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -6,6 +6,9 @@ build-i386:
 build-armv7a:
 	bash ./buildgcc -G -p armv7a-eabi
 
+build-aarch64:
+	bash ./buildgcc -G -p aarch64-elf
+
 .PHONY: build-i386-without-gdb
 build-i386-without-gdb:
 	bash ./buildgcc -p i386-elf
@@ -14,6 +17,10 @@ build-i386-without-gdb:
 build-armv7a-without-gdb:
 	bash ./buildgcc -p armv7a-eabi
 
+.PHONY: build-aarch64-without-gdb
+build-aarch64-without-gdb:
+	bash ./buildgcc -p aarch64-elf
+
 clean:
 	rm -rf xgcc
 
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 7bb6e4c93d..45dae8c1e8 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -184,7 +184,7 @@ arch_config_aarch64() {
 	TBFDARCH="littleaarch64"
 	TCLIST="aarch64"
 	TWIDTH="64"
-	TABI="eabi"
+	TABI="elf"
 }
 
 arch_config_riscv() {