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 5E171433AC for ; Thu, 23 Nov 2023 17:17:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 488F942FC7; Thu, 23 Nov 2023 17:17:23 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id B667A42F21 for ; Thu, 23 Nov 2023 17:17:21 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4079ed65582so6757545e9.1 for ; Thu, 23 Nov 2023 08:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700756241; x=1701361041; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z5VWzxEG45IeR557dvQWuzdC/f1yu96j4cMiMjW57KE=; b=GLJogSTFsf0AUuyyJdsGZgJXMefUAHEDxNXSkTUm0oNnAQBhy5tTcYd/VCkJpSNKnW WuOfcqjubhXzETxjUbmO0+ysD5jflTCzWRBx4Iw6/G1GHm23Ku9PinfY9vPnUkdnVSst cfGTqAOu+ASKyWmzpYsiZF03INj/0VHTEnOSqkINn6DA0wQumJIGkoQvsuCAnN1Tvol0 gyPR/17UByGqfn1VPC+BuUkqBDYUTyyiiJZ3DtnztJeLHI61vLjgabjY/bpdfaLySGfE xAfUQQkOS7oGk/n8iS5JN6J1OIVwQzkcOBkzD9ESANBhCorA/I/p0GCK5YqQyLsh0+bG dxXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700756241; x=1701361041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z5VWzxEG45IeR557dvQWuzdC/f1yu96j4cMiMjW57KE=; b=JT/42PaDbjBP3edVW/ZVxlJs4jA7dbL1h5naXC+IPe3YXkyWdEo8uVCuRGwCTb79O4 eWC9uXpwg+KPGoYPjsWEip3h2LVPM6ReoeWvcQmBZg5IW/OLs/t63GdaNzD1xUFf8S6L DkUzz5DgKxg9m6Uva/rU4j36AolaDNPBjyhUTByOPpbXeHcXZ7/Kni+S835sVq/ugyvT ykpKcxwEBwEH2qyXDSA8mf73stiLZeYMN4S/Dd+Y6WsFZikLn0MJaahsMH7PAP0cq1Aq vMUIN6RYGRrJE8YEJFG2Cqq7eZg+4GP8vmA32xuY4966KF/Rh5o3ZahV0F9YO8doq3CQ N/VQ== X-Gm-Message-State: AOJu0Ywt0GYrCcNcLeScpFRANYvrN7aGoYxwlFcxrHGNTIMF/a+4iXhj RFdVSMOgeZSWklAqS3azxkM= X-Google-Smtp-Source: AGHT+IHkArz6LjHKUa/J2fsFYlg0j+uIDPJup/s8WtCbCP/mw3gh5LaNzHzwdJv+cw0RMx2EQ89cLg== X-Received: by 2002:adf:fe0e:0:b0:32d:b051:9a27 with SMTP id n14-20020adffe0e000000b0032db0519a27mr4446747wrr.20.1700756241143; Thu, 23 Nov 2023 08:17:21 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id o10-20020adfcf0a000000b00332cb5185edsm2055022wrj.14.2023.11.23.08.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 08:17:20 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Tyler Retzlaff , Dmitry Kozlyuk , Thomas Monjalon , dpdk stable Subject: patch 'eal/windows: fix build with recent MinGW' has been queued to stable release 20.11.10 Date: Thu, 23 Nov 2023 16:17:05 +0000 Message-Id: <20231123161709.670852-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123161709.670852-1-luca.boccassi@gmail.com> References: <20231115114515.2355140-16-luca.boccassi@gmail.com> <20231123161709.670852-1-luca.boccassi@gmail.com> 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 Hi, FYI, your patch has been queued to stable release 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/25/23. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f52040e04787ad91d64c3c09107cf9a06bb69b11 Thanks. Luca Boccassi --- >From f52040e04787ad91d64c3c09107cf9a06bb69b11 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 14 Nov 2023 19:05:29 +0200 Subject: [PATCH] eal/windows: fix build with recent MinGW [ upstream commit c6221c664e52a94baf259a29ea73645496502af1 ] Windows compilation with cross-mingw on Fedora 39 failed because MEM_REPLACE_PLACEHOLDER and MEM_RESERVE_PLACEHOLDER were already defined in the compiler environment: eal_memory.c:77: error: "MEM_REPLACE_PLACEHOLDER" redefined /usr/x86_64-w64-mingw32/sys-root/mingw/include/winnt.h:5710: note: this is the location of the previous definition eal_memory.c:78: error: "MEM_RESERVE_PLACEHOLDER" redefined /usr/x86_64-w64-mingw32/sys-root/mingw/include/winnt.h:5715: note: this is the location of the previous definition The patch masks MEM_REPLACE_PLACEHOLDER and MEM_RESERVE_PLACEHOLDER macros if they were pre-defined by compiler. The patch also masks MEM_COALESCE_PLACEHOLDERS and MEM_PRESERVE_PLACEHOLDER to prevent similar errors. Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management") Signed-off-by: Gregory Etelson Acked-by: Tyler Retzlaff Acked-by: Dmitry Kozlyuk Acked-by: Thomas Monjalon --- lib/librte_eal/windows/eal_memory.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/windows/eal_memory.c b/lib/librte_eal/windows/eal_memory.c index 2fd37d9708..643e0e7a16 100644 --- a/lib/librte_eal/windows/eal_memory.c +++ b/lib/librte_eal/windows/eal_memory.c @@ -72,10 +72,18 @@ static VirtualAlloc2_type VirtualAlloc2_ptr; #ifdef RTE_TOOLCHAIN_GCC +#ifndef MEM_COALESCE_PLACEHOLDERS #define MEM_COALESCE_PLACEHOLDERS 0x00000001 +#endif +#ifndef MEM_PRESERVE_PLACEHOLDER #define MEM_PRESERVE_PLACEHOLDER 0x00000002 +#endif +#ifndef MEM_REPLACE_PLACEHOLDER #define MEM_REPLACE_PLACEHOLDER 0x00004000 +#endif +#ifndef MEM_RESERVE_PLACEHOLDER #define MEM_RESERVE_PLACEHOLDER 0x00040000 +#endif int eal_mem_win32api_init(void) -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-23 16:15:19.421163912 +0000 +++ 0005-eal-windows-fix-build-with-recent-MinGW.patch 2023-11-23 16:15:19.215058380 +0000 @@ -1 +1 @@ -From c6221c664e52a94baf259a29ea73645496502af1 Mon Sep 17 00:00:00 2001 +From f52040e04787ad91d64c3c09107cf9a06bb69b11 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c6221c664e52a94baf259a29ea73645496502af1 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ - lib/eal/windows/eal_memory.c | 8 ++++++++ + lib/librte_eal/windows/eal_memory.c | 8 ++++++++ @@ -35,4 +36,4 @@ -diff --git a/lib/eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c -index 215d768e2c..31410a41fd 100644 ---- a/lib/eal/windows/eal_memory.c -+++ b/lib/eal/windows/eal_memory.c +diff --git a/lib/librte_eal/windows/eal_memory.c b/lib/librte_eal/windows/eal_memory.c +index 2fd37d9708..643e0e7a16 100644 +--- a/lib/librte_eal/windows/eal_memory.c ++++ b/lib/librte_eal/windows/eal_memory.c