From 99d6231fdca76d260b2ed8d0ec1b0578e237d63b Mon Sep 17 00:00:00 2001 From: Jan Viktorin Date: Mon, 13 Jun 2016 17:07:37 +0200 Subject: [PATCH] mk: define objcopy-specific target and arch The program objcopy uses non-standard conventions to name the target and arch. Define the values for supported architectures (tile and ppc_64 are missing). Signed-off-by: Jan Viktorin --- mk/arch/arm/rte.vars.mk | 5 +++++ mk/arch/arm64/rte.vars.mk | 5 +++++ mk/arch/i686/rte.vars.mk | 5 +++++ mk/arch/x86_64/rte.vars.mk | 5 +++++ mk/arch/x86_x32/rte.vars.mk | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk index bd85140e08..2f8cf7cb9e 100644 --- a/mk/arch/arm/rte.vars.mk +++ b/mk/arch/arm/rte.vars.mk @@ -37,3 +37,8 @@ CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS + +RTE_OBJCOPY_TARGET = elf32-littlearm +RTE_OBJCOPY_ARCH = arm + +export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk index 32e3a5fd95..c168426ddf 100644 --- a/mk/arch/arm64/rte.vars.mk +++ b/mk/arch/arm64/rte.vars.mk @@ -56,3 +56,8 @@ CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS + +RTE_OBJCOPY_TARGET = elf64-littleaarch64 +RTE_OBJCOPY_ARCH = aarch64 + +export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk index 8ba9a23003..6a25312cc3 100644 --- a/mk/arch/i686/rte.vars.mk +++ b/mk/arch/i686/rte.vars.mk @@ -57,3 +57,8 @@ CPU_LDFLAGS ?= -melf_i386 CPU_ASFLAGS ?= -felf export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS + +RTE_OBJCOPY_TARGET = elf32-i386 +RTE_OBJCOPY_ARCH = i386 + +export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk index b986f04b13..83723c8e03 100644 --- a/mk/arch/x86_64/rte.vars.mk +++ b/mk/arch/x86_64/rte.vars.mk @@ -57,3 +57,8 @@ CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf64 export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS + +RTE_OBJCOPY_TARGET = elf64-x86-64 +RTE_OBJCOPY_ARCH = i386:x86-64 + +export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH diff --git a/mk/arch/x86_x32/rte.vars.mk b/mk/arch/x86_x32/rte.vars.mk index 3103dfc9b2..676f316769 100644 --- a/mk/arch/x86_x32/rte.vars.mk +++ b/mk/arch/x86_x32/rte.vars.mk @@ -61,3 +61,8 @@ ifneq ($(shell echo | $(CC) $(CPU_CFLAGS) -E - 2>/dev/null 1>/dev/null && echo 0 endif export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS + +RTE_OBJCOPY_TARGET = elf32-x86-64 +RTE_OBJCOPY_ARCH = i386:x86-64 + +export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH -- 2.20.1