From patchwork Sat Jul 1 06:00:20 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: 106788 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp3156848qge; Fri, 30 Jun 2017 23:06:18 -0700 (PDT) X-Received: by 10.55.150.193 with SMTP id y184mr26175002qkd.113.1498889178924; Fri, 30 Jun 2017 23:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498889178; cv=none; d=google.com; s=arc-20160816; b=T6qS8KTXdxeMjDg6XxgzDvGUBrAaPyTsOSl1H0Sm9psQ7sE7tGFdv1LMud0oyNy5tP ZZGt414dHJPdluhYWN8uME9uuSUQmqZQ+tn1/ynB8cEPt/rC/xZz5rIC5Xvw10enkKyo 8y0DwUSl97nFr/TJlAscoOmm/11fYvyGw3U6XqGrGeAnwh3xRtCpYSFAPgJ4tjUSY3rt 5n/2Ohc8X9fO1oAkiF7CE2Lvey96b54H0Slgi9+2c6ReZyE1I/MLulfxG5Hf0CxBqLn5 BNINKxHfkBYKJU6mZyR58ba/k0fVfpZ3petIdP9oL3VIspq/IhuUkjIhpLBuMv+nEKmJ JyTA== 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=N3O0Vlp+R0zEl3A1U2kQvUUZJgqHlIMDFX8zpBrQB8A=; b=xj6ydh0A3/k9zrLe/SvMa5PcTqWOC5v3qjKngHNOL+31jUoZUwTDZwEsQvfryutso4 IgQE18x2saaXMNuffxq6K5BqmvYy3Z42rhKIjGCK8k9wSCm8tmXWKmcx831PXmiv7XdJ 5lBM2LhjEbzS12k17wJZi/99mGCCENBeNGAVUOgNd4Xac24JKbIuVOu03k+ky4WHkFvx HapoZjYEGN6Ox+06Mlfime5ijW7Q120yXrt4ZWCCqA+SoE+lijha/cAR7kvBl74sH79+ fPc+fmV1yft2dEdf7EvClQsTg2WllZnY8bughZ9XojoLo54TSpFvk0MnwqwTuaLuoiZS 9yWA== 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 h37si9883855qtf.331.2017.06.30.23.06.18; Fri, 30 Jun 2017 23:06:18 -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 90DC362CB2; Sat, 1 Jul 2017 06:06:18 +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 C380460CE2; Sat, 1 Jul 2017 06:01:14 +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 3422060CE8; Sat, 1 Jul 2017 06:01:09 +0000 (UTC) Received: from forward4p.cmail.yandex.net (forward4p.cmail.yandex.net [77.88.31.19]) by lists.linaro.org (Postfix) with ESMTPS id 59A5360CE2 for ; Sat, 1 Jul 2017 06:00:35 +0000 (UTC) Received: from smtp3m.mail.yandex.net (smtp3m.mail.yandex.net [IPv6:2a02:6b8:0:2519::125]) by forward4p.cmail.yandex.net (Yandex) with ESMTP id 1EC8F20D67 for ; Sat, 1 Jul 2017 09:00:33 +0300 (MSK) Received: from smtp3m.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3m.mail.yandex.net (Yandex) with ESMTP id F40732840F44 for ; Sat, 1 Jul 2017 09:00:32 +0300 (MSK) Received: by smtp3m.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id uZqkAfj1Oz-0VD46htW; Sat, 01 Jul 2017 09:00:31 +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 09:00:20 +0300 Message-Id: <1498888823-4065-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498888823-4065-1-git-send-email-odpbot@yandex.ru> References: <1498888823-4065-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 45 Subject: [lng-odp] [PATCH v4 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: eee6b6add9a03184bf2f3198f07e983bb88c0e0a **/ 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 a59d424f..4c23d136 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -259,6 +259,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) if HAVE_PCAP __LIB__libodp_linux_la_LIBADD += $(PCAP_LIBS) 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"