python
diff --git a/‎Lib/test/test_sysconfig.py‎
Lines changed: 12 additions & 3 deletions b/‎Lib/test/test_sysconfig.py‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎Misc/NEWS‎
Lines changed: 4 additions & 4 deletions b/‎Misc/NEWS‎
Lines changed: 4 additions & 4 deletions
@@ -390,10 +390,19 @@ def test_SO_in_vars(self):
         self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
 
     @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test')
-    def test_bitness_in_ext_suffix(self):
+    def test_triplet_in_ext_suffix(self):
+        import ctypes, platform, re
+        machine = platform.machine()
         suffix = sysconfig.get_config_var('EXT_SUFFIX')
-        bitness = '-32b' if sys.maxsize < 2**32 else '-64b'
-        self.assertTrue(suffix.endswith(bitness + '.so'), suffix)
+        if re.match('(aarch64|arm|mips|ppc|powerpc|s390|sparc)', machine):
+            self.assertTrue('linux' in suffix, suffix)
+        if re.match('(i[3-6]86|x86_64)$', 'x86_64'):
+            if ctypes.sizeof(ctypes.c_char_p()) == 4:
+                self.assertTrue(suffix.endswith('i386-linux-gnu.so') \
+                                or suffix.endswith('x86_64-linux-gnux32.so'),
+                                suffix)
+            else: # 8 byte pointer size
+                self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix)
 
 
 class MakefileTests(unittest.TestCase):
 
@@ -10,6 +10,10 @@ Release date: XXX
 Core and Builtins
 -----------------
 
+- Issue #22980: Under Linux, GNU/KFreeBSD and the Hurd, C extensions now include
+  the architecture triplet in the extension name, to make it easy to test builds
+  for different ABIs in the same working tree.
+
 - Issue #22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES.
   Patch courtesy of Joe Jevnik.
 
@@ -382,10 +386,6 @@ Release date: 2015-03-09
 Core and Builtins
 -----------------
 
-- Issue #22980: Under Linux, C extensions now include bitness in the file
-  name, to make it easy to test 32-bit and 64-bit builds in the same
-  working tree.
-
 - Issue #23571: PyObject_Call() and PyCFunction_Call() now raise a SystemError
   if a function returns a result and raises an exception. The SystemError is
   chained to the previous exception.