X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Farch%2Fi686%2Frte.vars.mk;h=3f48f6744026b84d73ca8b2518a1a0aed98634c1;hb=1c5c7c91d300355b5b76c5c396e54f6b35bac28a;hp=de3fa00ec72bdf0a054e1493271da388fefb88fe;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk index de3fa00ec7..3f48f67440 100644 --- a/mk/arch/i686/rte.vars.mk +++ b/mk/arch/i686/rte.vars.mk @@ -1,47 +1,18 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2013 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation # # arch: # -# - define ARCH variable (overriden by cmdline or by previous +# - define ARCH variable (overridden by cmdline or by previous # optional define in machine .mk) -# - define CROSS variable (overriden by cmdline or previous define +# - define CROSS variable (overridden by cmdline or previous define # in machine .mk) -# - define CPU_CFLAGS variable (overriden by cmdline or previous +# - define CPU_CFLAGS variable (overridden by cmdline or previous # define in machine .mk) -# - define CPU_LDFLAGS variable (overriden by cmdline or previous +# - define CPU_LDFLAGS variable (overridden by cmdline or previous # define in machine .mk) -# - define CPU_ASFLAGS variable (overriden by cmdline or previous +# - define CPU_ASFLAGS variable (overridden by cmdline or previous # define in machine .mk) # - may override any previously defined variable # @@ -49,6 +20,8 @@ # ARCH ?= i386 +# common arch dir in eal headers +ARCH_DIR := x86 CROSS ?= CPU_CFLAGS ?= -m32 @@ -56,3 +29,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