X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Ftarget%2Fgeneric%2Frte.vars.mk;h=53650c38151d357f0a333167b0fd8610ddd3ae6d;hb=55a3fb5f7c41ec1a1cfb094d7ec3914ea3502f7b;hp=9030f44cfbaf80a8acf407a4f8d343719d2f1990;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index 9030f44cfb..53650c3815 100644 --- a/mk/target/generic/rte.vars.mk +++ b/mk/target/generic/rte.vars.mk @@ -1,12 +1,12 @@ # BSD LICENSE -# -# Copyright(c) 2010-2013 Intel Corporation. All rights reserved. +# +# Copyright(c) 2010-2014 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 @@ -16,7 +16,7 @@ # * 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 @@ -94,7 +94,7 @@ include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk # - define EXECENV_ASFLAGS variable (overriden by cmdline) # - may override any previously defined variable # -# examples for RTE_EXEC_ENV: linuxapp, baremetal +# examples for RTE_EXEC_ENV: linuxapp, bsdapp # include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk @@ -102,6 +102,10 @@ include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk # provided by Kbuild framework. ifeq ($(KERNELRELEASE),) +# now that the environment is mostly set up, including the machine type we will +# be passing to the compiler, set up the specific CPU flags based on that info. +include $(RTE_SDK)/mk/rte.cpuflags.mk + # merge all CFLAGS CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS) CFLAGS += $(TARGET_CFLAGS)