From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0ECDBA0093 for ; Tue, 7 Dec 2021 15:17:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C998E4114A; Tue, 7 Dec 2021 15:17:01 +0100 (CET) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by mails.dpdk.org (Postfix) with ESMTP id 26BC04114A for ; Tue, 7 Dec 2021 15:17:00 +0100 (CET) Received: by mail-lf1-f47.google.com with SMTP id d10so13909798lfg.6 for ; Tue, 07 Dec 2021 06:17:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=62seNtlnOfvuZti6uFINe48IZf3FD0cJ7l3SK1SAZUM=; b=mfrwaEHuERvlQ76pO16yRhsnehfb4fwQTgzrdnHcPB0eU3d1dElrlOZaN7xJo/L4LK 9V63YZXBorEGv+5ZFAR+fHfyV6CALTvHrMzghOlLjRPtihuRIVvSNOBIJHFScdcsq0Ph Mq5lGnwxmeIhFAULKASb6B240bWee2ldg8mF2N6R8mHoG00O5+TVAaXhSSfkF2t0Pxo4 8vRWTavD2KZhYswcXygwiETLo5j5KAyiyH57C4I1QPsXNndUe8k+7wJt32Ft9cd5rKv5 OwwwUoWhuMVcpQNxabBegGErXK19oTmumbDBgALbiWQpDVjLNERil4aEt04Cfket87HB dB4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=62seNtlnOfvuZti6uFINe48IZf3FD0cJ7l3SK1SAZUM=; b=QUzi6Yk+ySPdMQxu1M4YUyVLMW7p8Qwp8AJFgFW8QZjxF/yccTel4KRwBK4fP/KxVD 0TC4qmbeUf7Z2qm4yp0VxfpdfMId6dGWWfBaEgznaLU95YVmVmPBqKXG+fMR8jSfg1Pk KFnjOpal2AAbSE40j6izXuhm/1ySOS+ah6zy/4ogkphs8424wzBbVJIQJ1lmhAt9bkp4 cMY+Hj62Yq/XoqjDL9G2dcd6C+UiWx3rnMMA4OShtjP4eRoDvVy9dOl0sKsRyKIFCWhl lBf6AalWiww10Zdc3yttqazRYPvQMO01MBCvjD4sGVrljtIPu5tWGGOKHX53aiavbcmq UoPg== X-Gm-Message-State: AOAM531gNgkI+Fz+NCzOFSa6PbKmSd3ziTzHNpkgaNewNY2ZVrY0fHkw qjxHkXj5hZoOMGTT9QwYBhvC5jcHb9Q= X-Google-Smtp-Source: ABdhPJxm7PiLvOThJSzhT7VuVyGZYEspxQ7RkSEjf4U7eagW3A/m79YZ88q3ao5BzKF83pIlt02hdA== X-Received: by 2002:a19:e054:: with SMTP id g20mr43014644lfj.238.1638886619482; Tue, 07 Dec 2021 06:16:59 -0800 (PST) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id e11sm1700849lfq.65.2021.12.07.06.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 06:16:58 -0800 (PST) From: Dmitry Kozlyuk To: stable@dpdk.org Cc: Xueming Li , Dmitry Kozlyuk , Liang Longfeng , Ranjit Menon , William Tu Subject: [PATCH 20.11] eal/common: exclude code unsupported on Windows Date: Tue, 7 Dec 2021 17:16:44 +0300 Message-Id: <20211207141644.369624-1-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 rte_random.c and hotplug_mp.c are only intended for Unix targets, but were compiled on Windows due to backporting mistake, causing an error: In file included from ../lib/librte_eal/common/rte_random.c:13: [...] C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\um\winnt.h:3275:1: error: conflicting types for '_m_prefetchw' _m_prefetchw ( ^ C:\Program Files\LLVM\lib\clang\8.0.0\include\prfchwintrin.h:64:1: note: previous definition is here _m_prefetchw(void *__P) ^ 1 error generated. hotplug_mp.c was compiled twice, which also caused a link-time error: [43/146] Linking target lib/rte_eal-21.dll FAILED: lib/rte_eal-21.dll lib/rte_eal-21.pdb "clang" @lib/rte_eal-21.dll.rsp librte_eal_windows_eal_mp.c.obj : error LNK2005: eal_dev_hotplug_request_to_primary already defined in librte_eal_common_hotplug_mp.c.obj librte_eal_windows_eal_mp.c.obj : error LNK2005: eal_dev_hotplug_request_to_secondary already defined in librte_eal_common_hotplug_mp.c.obj Creating library lib\rte_eal.lib and object lib\rte_eal.exp lib\rte_eal-21.dll : fatal error LNK1169: one or more multiply defined symbols found clang: error: linker command failed with exit code 1169 (use -v to see invocation) Compile the files above only for Unix targets. Bugzilla ID: 894 Fixes: 51a9cd2327f3 ("eal: remove Windows-specific list of common files") Reported-by: Liang Longfeng Signed-off-by: Dmitry Kozlyuk --- lib/librte_eal/common/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index e7ea0fd388..7105e8bc4b 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -29,11 +29,9 @@ sources += files( 'eal_common_timer.c', 'eal_common_trace_points.c', 'eal_common_uuid.c', - 'hotplug_mp.c', 'malloc_elem.c', 'malloc_heap.c', 'rte_malloc.c', - 'rte_random.c', 'rte_reciprocal.c', 'rte_service.c', ) @@ -50,6 +48,7 @@ if not is_windows 'eal_common_trace_utils.c', 'hotplug_mp.c', 'malloc_mp.c', + 'rte_random.c', 'rte_keepalive.c', ) endif -- 2.29.3