From: David Marchand Date: Fri, 26 Sep 2014 14:03:59 +0000 (+0200) Subject: mk: no more bare metal environment X-Git-Tag: spdx-start~10032 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=9ee27b718bd45d586129d2365c28b51a7bfa0baf;p=dpdk.git mk: no more bare metal environment Signed-off-by: David Marchand Signed-off-by: Thomas Monjalon Acked-by: Neil Horman --- diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk index fef9579eac..aed0e18d61 100644 --- a/mk/exec-env/bsdapp/rte.vars.mk +++ b/mk/exec-env/bsdapp/rte.vars.mk @@ -37,7 +37,7 @@ # - 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 # ifeq ($(RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk index d4808c2113..afcefa6d16 100644 --- a/mk/exec-env/linuxapp/rte.vars.mk +++ b/mk/exec-env/linuxapp/rte.vars.mk @@ -37,7 +37,7 @@ # - 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 # ifeq ($(RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 06cfd35ccc..84ec4df8b4 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -149,15 +149,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_RING),y) LDLIBS += -lrte_ring endif -ifeq ($(CONFIG_RTE_LIBC),y) -LDLIBS += -lc -LDLIBS += -lm -endif - -ifeq ($(CONFIG_RTE_LIBGLOSS),y) -LDLIBS += -lgloss -endif - ifeq ($(CONFIG_RTE_LIBRTE_EAL),y) LDLIBS += -lrte_eal endif diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index f7eab1dc5f..e8423b0d0b 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -53,7 +53,7 @@ export BUILDING_RTE_SDK # # We can specify the configuration template when doing the "make -# config". For instance: make config T=i686-native-baremetal-gcc +# config". For instance: make config T=x86_64-native-linuxapp-gcc # RTE_CONFIG_TEMPLATE := ifdef T diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index 6020f2017e..53650c3815 100644 --- a/mk/target/generic/rte.vars.mk +++ b/mk/target/generic/rte.vars.mk @@ -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 diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk index 993eb2674a..88f235cc99 100644 --- a/mk/toolchain/gcc/rte.vars.mk +++ b/mk/toolchain/gcc/rte.vars.mk @@ -75,11 +75,7 @@ WERROR_FLAGS := -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual WERROR_FLAGS += -Wformat-nonliteral -Wformat-security - -ifeq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") -# These trigger warnings in newlib, so can't be used for baremetal WERROR_FLAGS += -Wundef -Wwrite-strings -endif # process cpu flags include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk index f03a2a27c5..5503fb09f0 100644 --- a/mk/toolchain/icc/rte.vars.mk +++ b/mk/toolchain/icc/rte.vars.mk @@ -67,22 +67,7 @@ TOOLCHAIN_ASFLAGS = # Remark #271 : trailing comma is nonstandard # Warning #1478 : function "" (declared at line N of "") # was declared "deprecated" -ifeq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") WERROR_FLAGS := -Wall -Werror-all -w2 -diag-disable 271 -diag-warning 1478 -else - -# Turn off some ICC warnings - -# Remark #193 : zero used for undefined preprocessing identifier -# (needed for newlib) -# Remark #271 : trailing comma is nonstandard -# Remark #1292 : attribute "warning" ignored ((warning ("the use of -# `mktemp' is dangerous; use `mkstemp' instead")))); -# (needed for newlib) -# Warning #1478 : function "" (declared at line N of "") -# was declared "deprecated" -WERROR_FLAGS := -Wall -Werror-all -w2 -diag-disable 193,271,1292 \ - -diag-warning 1478 -endif # process cpu flags include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk