From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B1BFAA00E6 for ; Tue, 16 Apr 2019 16:39:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A605F1B4DF; Tue, 16 Apr 2019 16:39:05 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 00ADC1B4DF for ; Tue, 16 Apr 2019 16:39:05 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67E433086229; Tue, 16 Apr 2019 14:39:04 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59BB41001E92; Tue, 16 Apr 2019 14:39:03 +0000 (UTC) From: Kevin Traynor To: Andrius Sirvys Cc: Bruce Richardson , dpdk stable Date: Tue, 16 Apr 2019 15:37:10 +0100 Message-Id: <20190416143719.21601-52-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 16 Apr 2019 14:39:04 +0000 (UTC) Subject: [dpdk-stable] patch 'acl: fix compiler flags with meson and AVX2 runtime' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >From 6af0b4da4e369f44ee1b2f80e2c09c3159f8d134 Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Mon, 11 Mar 2019 15:18:11 +0000 Subject: [PATCH] acl: fix compiler flags with meson and AVX2 runtime [ upstream commit cd6683331dced0c910cb850a6d8f9bcd784ca693 ] When compiling the ACL library on a system without AVX2 support, the flags used to compile the AVX2-specific code for later run-time use were not based on the regular cflags for the rest of the library. This can cause errors due to symbols being missed/undefined due to incorrect flags. For example, when testing compilation on Alpine linux, we got: error: unknown type name 'cpu_set_t' due to _GNU_SOURCE not being defined in the cflags. This issue can be fixed by appending "-mavx2" to the cflags rather than replacing them with it. Fixes: 5b9656b157d3 ("lib: build with meson") Signed-off-by: Andrius Sirvys Acked-by: Bruce Richardson --- lib/librte_acl/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_acl/meson.build b/lib/librte_acl/meson.build index aec792f51..2207dbafe 100644 --- a/lib/librte_acl/meson.build +++ b/lib/librte_acl/meson.build @@ -24,5 +24,5 @@ if arch_subdir == 'x86' 'acl_run_avx2.c', dependencies: static_rte_eal, - c_args: '-mavx2') + c_args: cflags + ['-mavx2']) objs += avx2_tmplib.extract_objects('acl_run_avx2.c') cflags += '-DCC_AVX2_SUPPORT' -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:27.522952339 +0100 +++ 0052-acl-fix-compiler-flags-with-meson-and-AVX2-runtime.patch 2019-04-16 15:34:25.231178818 +0100 @@ -1,8 +1,10 @@ -From cd6683331dced0c910cb850a6d8f9bcd784ca693 Mon Sep 17 00:00:00 2001 +From 6af0b4da4e369f44ee1b2f80e2c09c3159f8d134 Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Mon, 11 Mar 2019 15:18:11 +0000 Subject: [PATCH] acl: fix compiler flags with meson and AVX2 runtime +[ upstream commit cd6683331dced0c910cb850a6d8f9bcd784ca693 ] + When compiling the ACL library on a system without AVX2 support, the flags used to compile the AVX2-specific code for later run-time use were not based on the regular cflags for the rest of the library. @@ -16,7 +18,6 @@ the cflags rather than replacing them with it. Fixes: 5b9656b157d3 ("lib: build with meson") -Cc: stable@dpdk.org Signed-off-by: Andrius Sirvys Acked-by: Bruce Richardson