From: Zbigniew Bodek <zbigniew.bo...@caviumnetworks.com>
Avoid using incorrect assembler (nasm) and unsupported flags
when building for ARM64.
Fixes: af75078fece3 ("first public release")
b3ce00e5fe36 ("mk: introduce ARMv8 architecture")
Signed-off-by: Zbigniew Bodek <zbigniew.bo...@caviumnetworks.com>
---
mk/arch/arm64/rte.vars.mk | 1 -
mk/toolchain/gcc/rte.vars.mk | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk
index c168426..3b1178a 100644
--- a/mk/arch/arm64/rte.vars.mk
+++ b/mk/arch/arm64/rte.vars.mk
@@ -53,7 +53,6 @@ CROSS ?=
CPU_CFLAGS ?=
CPU_LDFLAGS ?=
-CPU_ASFLAGS ?= -felf
export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
index ff70f3d..94f6412 100644
--- a/mk/toolchain/gcc/rte.vars.mk
+++ b/mk/toolchain/gcc/rte.vars.mk
@@ -41,9 +41,11 @@
CC = $(CROSS)gcc
KERNELCC = $(CROSS)gcc
CPP = $(CROSS)cpp
-# for now, we don't use as but nasm.
-# AS = $(CROSS)as
+ifeq ($(CONFIG_RTE_ARCH_X86),y)
AS = nasm
+else
+AS = $(CROSS)as
+endif
AR = $(CROSS)ar
LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
--
1.9.1
