From 9bd490e8d3e2ef54f39e9b273ff9aa5a6c40b360 Mon Sep 17 00:00:00 2001
From: dongbo4 <dongbo4@huawei.com>
Date: Wed, 7 Nov 2018 08:55:09 +0000
Subject: [PATCH] Add arch arm64 compiler options

---
 lib/Makefile | 35 +++++++++++++++++++++++++++++++----
 mk/kern.mk   |  4 ++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 8dc9d9d4..4c7c3c75 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -24,11 +24,19 @@ FF_KNI=1
 #FF_IPFW=1
 
 ifeq ($(FF_DPDK),)
-    FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc
+ifeq (${MACHINE_CPUARCH},aarch64)
+    FF_DPDK=${TOPDIR}/dpdk/build
+else
+    #FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc
+endif
 endif
 
 ifdef RTE_SDK
-    FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc
+ifeq (${MACHINE_CPUARCH},aarch64) 
+    FF_DPDK=${RTE_SDK}/build
+else
+    #FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc
+endif
 endif
 
 DPDK_CFLAGS= -Wall -Werror -include ${FF_DPDK}/include/rte_config.h
@@ -92,6 +100,13 @@ endif
 
 endif
 
+#
+# fix the MACHINE_CPUARCH to match the FreeBSD directory name
+#
+ifeq (${MACHINE_CPUARCH},aarch64)
+MACHINE_CPUARCH=arm64
+endif
+
 
 #
 # Distilled from FreeBSD src/sys/conf/Makefile.i386
@@ -262,7 +277,7 @@ KERN_MHEADERS+=		\
 KERN_MSRCS+=		\
 	linker_if.m
 
-
+ifeq (${MACHINE_CPUARCH},arm64)
 LIBKERN_SRCS+=		 \
 	bcd.c		 \
 	crc32.c          \
@@ -270,7 +285,19 @@ LIBKERN_SRCS+=		 \
 	jenkins_hash.c   \
 	strlcpy.c	 \
 	strnlen.c        \
-	zlib.c
+	zlib.c		 \
+	fls.c		 \
+	flsl.c
+else
+LIBKERN_SRCS+=		 \
+	bcd.c		 \
+	crc32.c          \
+	inet_ntoa.c	 \
+	jenkins_hash.c   \
+	strlcpy.c	 \
+	strnlen.c        \
+	zlib.c		 
+endif
 
 
 MACHINE_SRCS+=		 \
diff --git a/mk/kern.mk b/mk/kern.mk
index 877815d6..979e0a2f 100644
--- a/mk/kern.mk
+++ b/mk/kern.mk
@@ -101,6 +101,10 @@ CFLAGS+=
 INLINE_LIMIT?=	8000
 endif
 
+ifeq (${MACHINE_CPUARCH},arm64)
+INLINE_LIMIT?=	15000
+endif
+
 #
 # GCC SSP support
 #