From: Yeojin Kim <yeojin.k@linecorp.com>
Date: Fri, 24 Feb 2023 10:26:51 +0000 (+0900)
Subject: gh-81652: Add MAP_ALIGNED_SUPER FreeBSD and MAP_CONCEAL OpenBSD constants (gh-102191)
X-Git-Tag: v3.12.0a6~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=347f7406df62b2bbe551685d72a466f27b951f8e;p=thirdparty%2FPython%2Fcpython.git

gh-81652: Add MAP_ALIGNED_SUPER FreeBSD and MAP_CONCEAL OpenBSD constants (gh-102191)
---

diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
index c4f8781f2ac9..69afadff1f5f 100644
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -370,11 +370,19 @@ MAP_* Constants
           MAP_ANONYMOUS
           MAP_POPULATE
           MAP_STACK
+          MAP_ALIGNED_SUPER
+          MAP_CONCEAL
 
-    These are the various flags that can be passed to :meth:`mmap.mmap`. Note that some options might not be present on some systems.
+    These are the various flags that can be passed to :meth:`mmap.mmap`.  :data:`MAP_ALIGNED_SUPER`
+    is only available at FreeBSD and :data:`MAP_CONCEAL` is only available at OpenBSD.  Note
+    that some options might not be present on some systems.
 
     .. versionchanged:: 3.10
-       Added MAP_POPULATE constant.
+       Added :data:`MAP_POPULATE` constant.
 
     .. versionadded:: 3.11
-       Added MAP_STACK constant.
+       Added :data:`MAP_STACK` constant.
+
+    .. versionadded:: 3.12
+       Added :data:`MAP_ALIGNED_SUPER` constant.
+       Added :data:`MAP_CONCEAL` constant.
diff --git a/Misc/ACKS b/Misc/ACKS
index 33dbf4e989d9..43e420a1373c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -930,6 +930,7 @@ Derek D. Kim
 Gihwan Kim
 Jan Kim
 Taek Joo Kim
+Yeojin Kim
 Sam Kimbrel
 Tomohiko Kinebuchi
 James King
diff --git a/Misc/NEWS.d/next/Library/2023-02-23-20-39-52.gh-issue-81652.Vxz0Mr.rst b/Misc/NEWS.d/next/Library/2023-02-23-20-39-52.gh-issue-81652.Vxz0Mr.rst
new file mode 100644
index 000000000000..48acce1d863e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-02-23-20-39-52.gh-issue-81652.Vxz0Mr.rst
@@ -0,0 +1,2 @@
+Add :data:`mmap.MAP_ALIGNED_SUPER` FreeBSD and :data:`mmap.MAP_CONCEAL`
+OpenBSD constants to :mod:`mmap`. Patch by Yeojin Kim.
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 8244202376c7..a01e798265c5 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1603,6 +1603,12 @@ mmap_exec(PyObject *module)
     // Mostly a no-op on Linux and NetBSD, but useful on OpenBSD
     // for stack usage (even on x86 arch)
     ADD_INT_MACRO(module, MAP_STACK);
+#endif
+#ifdef MAP_ALIGNED_SUPER
+    ADD_INT_MACRO(module, MAP_ALIGNED_SUPER);
+#endif
+#ifdef MAP_CONCEAL
+    ADD_INT_MACRO(module, MAP_CONCEAL);
 #endif
     if (PyModule_AddIntConstant(module, "PAGESIZE", (long)my_getpagesize()) < 0 ) {
         return -1;