X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Ftarget%2Fgeneric%2Frte.vars.mk;h=84649b9b186cac33010cbc225dc2fb87e3a61233;hb=98a7ea332ba3da0f74ec951595d36a616165b255;hp=6020f2017e5fd314f243db5bdf58656e6c7f3505;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index 6020f2017e..84649b9b18 100644 --- a/mk/target/generic/rte.vars.mk +++ b/mk/target/generic/rte.vars.mk @@ -38,64 +38,60 @@ # # machine: # -# - can define ARCH variable (overriden by cmdline value) -# - can define CROSS variable (overriden by cmdline value) -# - define MACHINE_CFLAGS variable (overriden by cmdline value) -# - define MACHINE_LDFLAGS variable (overriden by cmdline value) -# - define MACHINE_ASFLAGS variable (overriden by cmdline value) -# - can define CPU_CFLAGS variable (overriden by cmdline value) that +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overriden by cmdline value) that +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overriden by cmdline value) that +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that # overrides the one defined in arch. # -# examples for RTE_MACHINE: default, pc, bensley, tylesburg, ... -# +ifneq ($(wildcard $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk),) include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk +else +MACHINE_CFLAGS := -march=$(RTE_MACHINE) +endif # # 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 # -# examples for RTE_ARCH: i686, x86_64 -# include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk # # toolchain: # # - define CC, LD, AR, AS, ... -# - define TOOLCHAIN_CFLAGS variable (overriden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overriden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overriden by cmdline value) +# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) +# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) +# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) # - may override any previously defined variable # -# examples for RTE_TOOLCHAIN: gcc, icc -# include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk # # exec-env: # -# - define EXECENV_CFLAGS variable (overriden by cmdline) -# - define EXECENV_LDFLAGS variable (overriden by cmdline) -# - define EXECENV_ASFLAGS variable (overriden by cmdline) +# - define EXECENV_CFLAGS variable (overridden by cmdline) +# - define EXECENV_LDFLAGS variable (overridden by cmdline) +# - define EXECENV_ASFLAGS variable (overridden by cmdline) # - may override any previously defined variable # -# examples for RTE_EXEC_ENV: linuxapp, baremetal -# include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk # Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are @@ -129,9 +125,6 @@ LDFLAGS += -L$(RTE_OUTPUT)/lib ifeq ($(BUILDING_RTE_SDK),1) # building sdk CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h -ifeq ($(CONFIG_RTE_INSECURE_FUNCTION_WARNING),y) -CFLAGS += -include rte_warnings.h -endif else # if we are building an external application, include SDK's lib and # includes too @@ -140,9 +133,6 @@ ifneq ($(wildcard $(RTE_OUTPUT)/include/rte_config.h),) CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h endif CFLAGS += -include $(RTE_SDK_BIN)/include/rte_config.h -ifeq ($(CONFIG_RTE_INSECURE_FUNCTION_WARNING),y) -CFLAGS += -include rte_warnings.h -endif LDFLAGS += -L$(RTE_SDK_BIN)/lib endif