From patchwork Wed Dec 17 21:59:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 2086 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 366848040; Wed, 17 Dec 2014 23:00:06 +0100 (CET) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 008B57F48 for ; Wed, 17 Dec 2014 22:59:54 +0100 (CET) Received: by mail-wg0-f52.google.com with SMTP id x12so21431061wgg.11 for ; Wed, 17 Dec 2014 13:59:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=e5up1qc4lL3FiYX4OmxBUTYUVSQ8IQ3t+wu4bWA/PSw=; b=dZGZIp9NZroI2FGItRRyZZ31vs218hcrPdhf3hYJFGTHpQh+Y+GQgHxxyneu9eaNSD mO1rzoxgerym0Ekptbf4vf3Lq/tepO0NMfjTuf8X7iVl4tQYhOi0LplnzcZl1/rmb5PJ c5xKyFGs6GR9jo4wTHk2pALoD07FNnaTb1A0vkyXvW4zuYrruGbch+tzy4BG4Fnak/Za EOSZbtC0u2rh2BQd36L9s+WxZ1+wpan4ugJATstMkXXGen92mxZSGqXD4Q58l167ur0M UNuBoWGOm5fffCllfdtwFU90V8Ut8aQOmI/nL893nF4klqt2gJm1r+xhvempupkiw1pt BwEQ== X-Gm-Message-State: ALoCoQnIZccdDSkYkbqWXWSJxfGuB64lL6i6MNUnDs2cZZNS9hQ02wFDK4ALw+GhUdJ2DIodzbMr X-Received: by 10.194.86.165 with SMTP id q5mr77112074wjz.10.1418853594704; Wed, 17 Dec 2014 13:59:54 -0800 (PST) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id js5sm22467293wid.11.2014.12.17.13.59.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Dec 2014 13:59:53 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 17 Dec 2014 22:59:17 +0100 Message-Id: <1418853558-2445-3-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1418853558-2445-1-git-send-email-thomas.monjalon@6wind.com> References: <2594499.JbYxbdnDqd@xps13> <1418853558-2445-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 2/3] mk: forbid multiple definitions 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The option "-z muldefs" was set only if not using ld directly. By the way, this option seems to be a useless hack introduced with shared and combined libraries support (e25e4d7ef16b8aa84de). The clean approach is to remove it. Signed-off-by: Thomas Monjalon --- mk/rte.lib.mk | 5 ++--- mk/rte.sharelib.mk | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index d83e808..a67c129 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -62,7 +62,6 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) ifeq ($(LINK_USING_CC),1) # Override the definition of LD here, since we're linking with CC LD := $(CC) $(CPU_CFLAGS) -LD_MULDEFS := $(call linkerprefix,-z$(comma)muldefs) CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) endif @@ -75,7 +74,7 @@ O_TO_A_DO = @set -e; \ $(O_TO_A) && \ echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) -O_TO_S = $(LD) $(CPU_LDFLAGS) $(LD_MULDEFS) -shared $(OBJS-y) -o $(LIB) +O_TO_S = $(LD) $(CPU_LDFLAGS) -shared $(OBJS-y) -o $(LIB) O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") O_TO_S_DO = @set -e; \ @@ -91,7 +90,7 @@ O_TO_C_DO = @set -e; \ $(lib_dir) \ $(copy_obj) else -O_TO_C = $(LD) $(LD_MULDEFS) -shared $(OBJS-y) -o $(LIB_ONE) +O_TO_C = $(LD) -shared $(OBJS-y) -o $(LIB_ONE) O_TO_C_STR = $(subst ','\'',$(O_TO_C)) #'# fix syntax highlight O_TO_C_DISP = $(if $(V),"$(O_TO_C_STR)"," LD_C $(@)") O_TO_C_DO = @set -e; \ diff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk index d0ec12a..d0cc7e3 100644 --- a/mk/rte.sharelib.mk +++ b/mk/rte.sharelib.mk @@ -50,11 +50,10 @@ OBJS = $(wildcard $(RTE_OUTPUT)/build/lib/*.o) ifeq ($(LINK_USING_CC),1) # Override the definition of LD here, since we're linking with CC LD := $(CC) $(CPU_CFLAGS) -LD_MULDEFS := $(call linkerprefix,-z$(comma)muldefs) CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) endif -O_TO_S = $(LD) $(CPU_LDFLAGS) $(LD_MULDEFS) -shared $(OBJS) \ +O_TO_S = $(LD) $(CPU_LDFLAGS) -shared $(OBJS) \ -o $(RTE_OUTPUT)/lib/$(LIB_ONE) O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)")