Order the multiarch-tagged extensions first

Author: stefanor

Doc/whatsnew/3.16.rst

@@ -79,9 +79,9 @@ Other language changes
   filename, e.g. ``foo.abi3-x86-64-linux-gnu.so``.
   This permits stable ABI extensions for multiple architectures to be
   co-installed into the same directory, without clashing with each
-  other, as regular dynamic extensions do. Build tools will not generate
-  these multiarch tagged filenames, by default, while still supporting
-  older Python versions that don't recognize these filenames.
+  other, as regular dynamic extensions do. Build may tools will generate
+  these multiarch tagged filenames, by default, when targeting
+  compatibility with at least Python 3.15.
   (Contributed by Stefano Rivera in :gh:`122931`.)
 
 

Python/dynload_shlib.c

@@ -46,15 +46,15 @@ const char *_PyImport_DynLoadFiletab[] = {
     "." ALT_SOABI ".so",
 #endif
 #ifndef Py_GIL_DISABLED
-    ".abi" PYTHON_ABI_STRING ".so",
 #ifdef SOABI_PLATFORM
     ".abi" PYTHON_ABI_STRING "-" SOABI_PLATFORM ".so",
 #endif  /* SOABI_PLATFORM */
+    ".abi" PYTHON_ABI_STRING ".so",
 #endif  /* Py_GIL_DISABLED */
-    ".abi" PYTHON_ABI_STRING "t.so",
 #ifdef SOABI_PLATFORM
     ".abi" PYTHON_ABI_STRING "t-" SOABI_PLATFORM ".so",
 #endif  /* SOABI_PLATFORM */
+    ".abi" PYTHON_ABI_STRING "t.so",
     ".so",
 #endif  /* __CYGWIN__ */
     NULL,