From patchwork Fri Jun 30 23:00:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 106776 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2882409qge; Fri, 30 Jun 2017 16:04:21 -0700 (PDT) X-Received: by 10.55.18.225 with SMTP id 94mr26966730qks.251.1498863861178; Fri, 30 Jun 2017 16:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498863861; cv=none; d=google.com; s=arc-20160816; b=zk48Vh9j5shYUFGyiC2/jCIsGYQFKTXywly829T9cecwgDBIe2LQHg+acxhD0kUd1a 2Sw2pEuj7GzbRD+TgLU0Nqq4HYkj9kypeR5WSVmdSe0HOrGwHsb08XrKY4Cz19r18G2t gjS5G3QEVnlhY3cT8PIYLz5WM0O9nWioYGb98EHJBSXws9qxUhg60bmbDNkkszU5ncZL ndCZxtx7XcKlbNdFp7tX/9D5/pH892FXCAsIm67bgHqTwPjNQnilx8oy0QvFzQisg1Kp UUCsRjx5Sy0oj+C8KwL6xHWNT8rQ6dNMvxNfVDUPUKYDaXeM1TzRrMwJw5QceQGnlPUj /L1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=EBTeWvEK0VpaptxO8nwM+aes7FqRPIuSyS7MtL4uSxU=; b=vYg4flT7c7ngntsYqI0/BNUfDSL69K3g3ZiJn++XdDTDPWJrwtjd9sFCHadu42AfJN KwdJ0cBw3xCAqKXH0ORE8V+55pPGfGNI5ZlUKYDtlxVNoEyJjYEVKbbWKNJ2mjZbMU+t 8dBOn/4zdiGodY6jEUD8nkQt6YKVMEKmy1ro/CEmJQT9VN++J40+dWjFTLx5l/QeY9y6 0XREVsTyRlwK7IYaReJApSZ64WW8YcnvLvZEx8dkhJUl252F7X8fGRVJkoZdzypq1KrL B1aYFe2CRKTSxC2Hz+6oW9CvWeKQZtsDlBohfNZxlyZtjtWILBL0gWt5C9SNYNs+LDuT RyYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c185si8466752qka.342.2017.06.30.16.04.20; Fri, 30 Jun 2017 16:04:21 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id CB20562AE9; Fri, 30 Jun 2017 23:04:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, URIBL_BLOCKED, URIBL_SBL, URIBL_SBL_A autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 5441E60EC3; Fri, 30 Jun 2017 23:01:24 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C432562CE7; Fri, 30 Jun 2017 23:01:18 +0000 (UTC) Received: from forward5j.cmail.yandex.net (forward5j.cmail.yandex.net [5.255.227.23]) by lists.linaro.org (Postfix) with ESMTPS id 2C5CD61BC5 for ; Fri, 30 Jun 2017 23:00:25 +0000 (UTC) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::28]) by forward5j.cmail.yandex.net (Yandex) with ESMTP id B953720C90 for ; Sat, 1 Jul 2017 02:00:23 +0300 (MSK) Received: from smtp4o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp4o.mail.yandex.net (Yandex) with ESMTP id 8FA7D6C01111 for ; Sat, 1 Jul 2017 02:00:23 +0300 (MSK) Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id jomLhvwstF-0M7GOxjN; Sat, 01 Jul 2017 02:00:22 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Sat, 1 Jul 2017 02:00:11 +0300 Message-Id: <1498863614-26294-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498863614-26294-1-git-send-email-odpbot@yandex.ru> References: <1498863614-26294-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 45 Subject: [lng-odp] [PATCH v3 6/9] linux-gen: stop poisoning CFLAGS/LDFLAGS with threading flags X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Instead of poisoning global AM_CFLAGS/AM_LDFLAGS with threading flags, use fine-grained controls for compiling/linking with threading. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 45 (lumag:m4) ** https://github.com/Linaro/odp/pull/45 ** Patch: https://github.com/Linaro/odp/pull/45.patch ** Base sha: ceeab69f3af67701adb524c7b9757d19cefb1110 ** Merge commit sha: bc5ee5a9b895a630b180cd264a55c8e4817de750 **/ platform/Makefile.inc | 2 ++ platform/linux-generic/Makefile.am | 1 + platform/linux-generic/m4/odp_pthread.m4 | 5 ----- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 1903d92d..738f0f9a 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -16,6 +16,8 @@ AM_CFLAGS += $(VISIBILITY_CFLAGS) #The implementation will need to retain the deprecated implementation AM_CFLAGS += -Wno-deprecated-declarations +AM_CFLAGS += @PTHREAD_CFLAGS@ + odpapispecincludedir= $(includedir)/odp/api/spec odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/align.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3d9bba69..e81057e5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -260,6 +260,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) __LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS) $(DPDK_PMDS) +__LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) # Create symlink for ABI header files. Application does not need to use the arch # specific include path for installed files. diff --git a/platform/linux-generic/m4/odp_pthread.m4 b/platform/linux-generic/m4/odp_pthread.m4 index 7f391039..48615894 100644 --- a/platform/linux-generic/m4/odp_pthread.m4 +++ b/platform/linux-generic/m4/odp_pthread.m4 @@ -6,8 +6,3 @@ AX_PTHREAD([CC="$PTHREAD_CC"], [ echo "Error! We require pthreads to be available" exit -1 ]) -LIBS="$PTHREAD_LIBS $LIBS" -AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" -AM_LDFLAGS="$AM_LDFLAGS $PTHREAD_LDFLAGS" - -AM_LDFLAGS="$AM_LDFLAGS -pthread -lrt"