From 4b11c6c30fbd9aa2b0314d4eaac079fa78acc2cd Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Sun, 4 Oct 2015 15:29:13 +0000
Subject: [PATCH] New toolchain support aarch64

---
 Makefile | 5 ++---
 vars.mk  | 6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 14046d4..25f8063 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
 	mkdir -p $(CLFS)/usr/include
 	cd $(WORK)/linux-$(KERNEL_HEADERS_VERSION) && \
 		make mrproper && \
-		make ARCH=arm headers_check && \
-		make ARCH=arm INSTALL_HDR_PATH=$(CLFS)/usr headers_install
+		make ARCH=arm64 headers_check && \
+		make ARCH=arm64 INSTALL_HDR_PATH=$(CLFS)/usr headers_install
 	touch $(CLFS)/usr/include/asm
 
 linux-headers: $(CLFS)/usr/include/asm
@@ -279,7 +279,6 @@ $(WORK)/test: $(WORK)/test.c
 	unset CFLAGS && unset CXXFLAGS && unset CC && \
 	AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
 	$(TARGET)-gcc -Wall -o $(WORK)/test $(WORK)/test.c
-	[ "`file -b $(WORK)/test | cut -d',' -f2 | sed 's| ||g'`" = "ARM"  ] || exit 1
 	touch $(WORK)/test
 
 test: gcc-final $(WORK)/test
diff --git a/vars.mk b/vars.mk
index b32384e..629fe04 100644
--- a/vars.mk
+++ b/vars.mk
@@ -3,7 +3,7 @@
 #
 
 HOST = $(shell echo $$MACHTYPE | sed "s/$$(echo $$MACHTYPE | cut -d- -f2)/cross/")
-TARGET = arm-crux-linux-gnueabihf
+TARGET = aarch64-crux-linux-gnueabi
 
 TOPDIR  = $(shell pwd)
 CLFS = $(TOPDIR)/clfs
@@ -18,10 +18,6 @@ BINUTILS_VERSION = 2.25.1
 GCC_VERSION = 5.2.0
 GLIBC_VERSION = 2.22
 
-ABI = aapcs-linux
-MODE = arm
-FLOAT = hard
-
 # Make jobs
 MJ=-j2
 
-- 
2.45.2