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 3BB8143699 for ; Thu, 7 Dec 2023 12:21:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33E7642EEA; Thu, 7 Dec 2023 12:21:40 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id AD13A40295 for ; Thu, 7 Dec 2023 12:21:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701948096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XehjPeRKM2EM2VNGTShx8qLl0wDONwO71va49LLsKTU=; b=VDuwaGoKFj+MDaNhCp0Ld890J5zXZEMvrX6AiDEUcnshDNwzwFiDXgMxf1arMoSYJDD3AZ 0kgPhsgAXp9jygyIm1kRZODAjfADkoy4Pw3JM9K2oCSJ1qNF8A5oZ+ruPXqHoPQYVwqh3v mlaO6ru8ul1yLHGef5ETseSJwLnEJao= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-518-nFgReh36N3-l-GnKEhGEgA-1; Thu, 07 Dec 2023 06:21:33 -0500 X-MC-Unique: nFgReh36N3-l-GnKEhGEgA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D91513C2A1C5; Thu, 7 Dec 2023 11:21:32 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C4DFC185A0; Thu, 7 Dec 2023 11:21:31 +0000 (UTC) From: Kevin Traynor 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 21.11.6 Date: Thu, 7 Dec 2023 11:20:59 +0000 Message-ID: <20231207112116.769502-7-ktraynor@redhat.com> In-Reply-To: <20231207112116.769502-1-ktraynor@redhat.com> References: <20231207112116.769502-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/12/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b2d5c193dffba21526fe7a2ae0a2c1a0668a0bfe Thanks. Kevin --- >From b2d5c193dffba21526fe7a2ae0a2c1a0668a0bfe 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/eal/windows/eal_memory.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c index 2fd37d9708..643e0e7a16 100644 --- a/lib/eal/windows/eal_memory.c +++ b/lib/eal/windows/eal_memory.c @@ -73,8 +73,16 @@ 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 -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-07 11:18:59.796221386 +0000 +++ 0007-eal-windows-fix-build-with-recent-MinGW.patch 2023-12-07 11:18:59.617873893 +0000 @@ -1 +1 @@ -From c6221c664e52a94baf259a29ea73645496502af1 Mon Sep 17 00:00:00 2001 +From b2d5c193dffba21526fe7a2ae0a2c1a0668a0bfe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c6221c664e52a94baf259a29ea73645496502af1 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -36 +37 @@ -index 215d768e2c..31410a41fd 100644 +index 2fd37d9708..643e0e7a16 100644