From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 20B79A051C for ; Tue, 11 Feb 2020 12:34:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 168583256; Tue, 11 Feb 2020 12:34:50 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by dpdk.org (Postfix) with ESMTP id 368DE1BE90 for ; Tue, 11 Feb 2020 12:34:49 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id g3so10833858wrs.12 for ; Tue, 11 Feb 2020 03:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UxcBE5nHdzDAsPVH0am5jgqDlSy+5QYGq2y2wneV904=; b=KNA2P7HJoevCb4fWJ22acRbBsK+KoWrDsYqxglVzNdxgogUvFaWLZEVK1cHhylO8fq F6UjD3MX8Su7mcVwx/+hHBqqINH/26Gmm5NlPuu9uGoh0wQxjds/vDBGBnH8KVSmzH8L HLjhRAOQe31xwCj7DJmixCBSWaTHw3ZwW9yI/CyJm0v95xVAlu3j72ZbqlJhHMNlJ2Ym BWB9Otfeb9zSN7muOYjO6nB41hTZnBFWrYb3Z4zZd27yUsu8InDkxETqKkpXu8WuNeLf Qrlv89aJr6WPT0oII7nx9BQrFStltYMd3Z4b/EPZrJHHxIoytG4BGRjbbipMczBGKjNG dGhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UxcBE5nHdzDAsPVH0am5jgqDlSy+5QYGq2y2wneV904=; b=F64S2E7TR7BEwas0RDuXGpLREiznpW4abdcXKowQAtPSRp8CS0WAg8mI+J6GEwZYMd lkDZ0PRXDUD2cnAyzRnQ/8D9hfjYFmbeTq/sYSc/1/gLiRQZA0+PDMPjXq+1YfyvY/3Z xIdzYVNr3qm9S0OcAIfdfN60/Sxzg93YQRhg1aj9enM2B7h+TDXieekcVh9RNxSfvmzz rvRt4qXg5nNnpS8Vr4J5TNJcHVc7yCJr1xBVScCdk3ET1pVBLhMHih2fQaxAznAvvRmZ ZeShNMOV4EboO2rGzndHdfGRd3lEivSjIi9IuPkiHfPBzVXaVePMnb0c8xwpI2MeWcMl +c4A== X-Gm-Message-State: APjAAAXBbN5b5jcR5g/DXlfqhshZdGFQ0TAu7RF2lwevRf4IneTsUWV1 1Vpm5JqubSvuS9X5742ZtE4= X-Google-Smtp-Source: APXvYqwhTcdIo+Ae0MmaTp86svKmkIylGMu6PMxE74S0Zh+nqkjDmdnSVh1prNS1I8q/Vqq21g5Wrw== X-Received: by 2002:a5d:65cf:: with SMTP id e15mr7999870wrw.126.1581420888897; Tue, 11 Feb 2020 03:34:48 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 133sm3646839wme.32.2020.02.11.03.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:34:48 -0800 (PST) From: luca.boccassi@gmail.com To: Andrzej Ostruszka Cc: Bruce Richardson , David Marchand , dpdk stable Date: Tue, 11 Feb 2020 11:21:14 +0000 Message-Id: <20200211112216.3929-128-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: remove unneeded function versioning' has been queued to stable release 19.11.1 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 stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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. Luca Boccassi --- >From 131acf0ad071c6a05ad63fcc30c6bd6c10b7e4a0 Mon Sep 17 00:00:00 2001 From: Andrzej Ostruszka Date: Thu, 30 Jan 2020 10:25:30 +0100 Subject: [PATCH] build: remove unneeded function versioning [ upstream commit f2318b73c29427b291719dfcd511768acd620415 ] Timer, LPM and Distributor libraries no longer use function versioning and therefore do not need separate build for static and shared version of libraries. This patch removes use_function_versioning from their meson build files and corresponding include from the sources. Fixes: f2fb215843a9 ("timer: remove deprecated code") Fixes: 6e5b51676176 ("distributor: remove deprecated code") Fixes: c381a8d554b7 ("lpm: remove deprecated code") Signed-off-by: Andrzej Ostruszka Acked-by: Bruce Richardson Acked-by: David Marchand --- lib/librte_distributor/meson.build | 1 - lib/librte_distributor/rte_distributor.c | 1 - lib/librte_distributor/rte_distributor_single.c | 1 - lib/librte_lpm/meson.build | 1 - lib/librte_lpm/rte_lpm.c | 1 - lib/librte_lpm/rte_lpm6.c | 1 - lib/librte_timer/meson.build | 1 - lib/librte_timer/rte_timer.c | 1 - 8 files changed, 8 deletions(-) diff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build index 50b91887b5..266af64348 100644 --- a/lib/librte_distributor/meson.build +++ b/lib/librte_distributor/meson.build @@ -9,7 +9,6 @@ else endif headers = files('rte_distributor.h') deps += ['mbuf'] -use_function_versioning = true # for clang 32-bit compiles we need libatomic for 64-bit atomic ops if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 6c5b0c86e8..1c047f065a 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/librte_distributor/rte_distributor_single.c b/lib/librte_distributor/rte_distributor_single.c index 91d8824c64..abaf7730c3 100644 --- a/lib/librte_distributor/rte_distributor_single.c +++ b/lib/librte_distributor/rte_distributor_single.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build index 27ce45b531..021ac6d8d4 100644 --- a/lib/librte_lpm/meson.build +++ b/lib/librte_lpm/meson.build @@ -7,4 +7,3 @@ headers = files('rte_lpm.h', 'rte_lpm6.h') # without worrying about which architecture we actually need headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h') deps += ['hash'] -use_function_versioning = true diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index b78c487447..2687564194 100644 --- a/lib/librte_lpm/rte_lpm.c +++ b/lib/librte_lpm/rte_lpm.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "rte_lpm.h" diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c index c46e557e23..b981e40714 100644 --- a/lib/librte_lpm/rte_lpm6.c +++ b/lib/librte_lpm/rte_lpm6.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "rte_lpm6.h" diff --git a/lib/librte_timer/meson.build b/lib/librte_timer/meson.build index b7edfe2e7d..d3b828ce9d 100644 --- a/lib/librte_timer/meson.build +++ b/lib/librte_timer/meson.build @@ -4,4 +4,3 @@ sources = files('rte_timer.c') headers = files('rte_timer.h') allow_experimental_apis = true -use_function_versioning = true diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index ca88454ff6..4680a91b58 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "rte_timer.h" -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.167682691 +0000 +++ 0128-build-remove-unneeded-function-versioning.patch 2020-02-11 11:17:38.620005460 +0000 @@ -1,8 +1,10 @@ -From f2318b73c29427b291719dfcd511768acd620415 Mon Sep 17 00:00:00 2001 +From 131acf0ad071c6a05ad63fcc30c6bd6c10b7e4a0 Mon Sep 17 00:00:00 2001 From: Andrzej Ostruszka Date: Thu, 30 Jan 2020 10:25:30 +0100 Subject: [PATCH] build: remove unneeded function versioning +[ upstream commit f2318b73c29427b291719dfcd511768acd620415 ] + Timer, LPM and Distributor libraries no longer use function versioning and therefore do not need separate build for static and shared version of libraries. @@ -13,7 +15,6 @@ Fixes: f2fb215843a9 ("timer: remove deprecated code") Fixes: 6e5b51676176 ("distributor: remove deprecated code") Fixes: c381a8d554b7 ("lpm: remove deprecated code") -Cc: stable@dpdk.org Signed-off-by: Andrzej Ostruszka Acked-by: Bruce Richardson @@ -108,7 +109,7 @@ allow_experimental_apis = true -use_function_versioning = true diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c -index a1ed186cf5..89f27074f8 100644 +index ca88454ff6..4680a91b58 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -26,7 +26,6 @@