From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 5DA9D7E00 for ; Fri, 26 Sep 2014 15:58:06 +0200 (CEST) Received: by mail-wg0-f50.google.com with SMTP id l18so8859336wgh.33 for ; Fri, 26 Sep 2014 07:04:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CNP2gTnzXduZPrI+0NuhxHcwo1YRe4Ukts+QfisWv3s=; b=GFXfNQyzrk1YiPUZZegLssjwVLw2IMqJk6OqhV+qwmI0ruaoixcmBsqOKShdFkCYZ+ nLXpUt6/wBLbqxmuLDFtZVhlCFNB567gQzZkLAlzQT6etCeh01vwP22xY9lN62f5MCmt sQXMlBLhHruHdlpD+Z8VQMSOu9veQ04sEI6UQuAbWAsv95m6Dwd7bdKB5zUgfLJRAF+U R/S5i9CcRNNdnfH+j+Y13Ov7QbF7JkLSxMQ9IlzjWbGK129zuDmL8yX9RcKsdA5K0ygi dq9DllsfLri23RW8uHRVv8l6/T+d+I4aGUQNoTOuebC5qqS1CjCpZXiihSdsGZqJ+Lhq ryOg== X-Gm-Message-State: ALoCoQkSenZaAGq//4q4p1EtGGxq64h7yNclTNEiKRBaTMBvg3E6ogvmVd02sDgGG9OHNTVw8XH1 X-Received: by 10.194.5.234 with SMTP id v10mr24047511wjv.45.1411740268836; Fri, 26 Sep 2014 07:04:28 -0700 (PDT) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id fs13sm1246085wic.19.2014.09.26.07.04.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Sep 2014 07:04:28 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Fri, 26 Sep 2014 16:03:59 +0200 Message-Id: <1411740242-4240-3-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1411740242-4240-1-git-send-email-thomas.monjalon@6wind.com> References: <1411740242-4240-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 2/5] mk: no more bare metal environment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2014 13:58:06 -0000 From: David Marchand Signed-off-by: David Marchand Signed-off-by: Thomas Monjalon --- mk/exec-env/bsdapp/rte.vars.mk | 2 +- mk/exec-env/linuxapp/rte.vars.mk | 2 +- mk/rte.app.mk | 9 --------- mk/rte.sdkroot.mk | 2 +- mk/target/generic/rte.vars.mk | 2 +- mk/toolchain/gcc/rte.vars.mk | 4 ---- mk/toolchain/icc/rte.vars.mk | 15 --------------- 7 files changed, 4 insertions(+), 32 deletions(-) diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk index fef9579..aed0e18 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 d4808c2..afcefa6 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 34dff2a..76f2fd3 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 f7eab1d..e8423b0 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 6020f20..53650c3 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 262ebdf..fac5697 100644 --- a/mk/toolchain/gcc/rte.vars.mk +++ b/mk/toolchain/gcc/rte.vars.mk @@ -74,11 +74,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 612370d..807134a 100644 --- a/mk/toolchain/icc/rte.vars.mk +++ b/mk/toolchain/icc/rte.vars.mk @@ -70,22 +70,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 -- 2.0.4