Merge pull request #29701 from charris/backport-29697

charris · web-flow · commit f024265b1aec · 2025-09-06T14:13:25.000-06:00
BUG: Correct ambiguous logic for s390x CPU feature detection
diff --git a/meson_cpu/s390x/meson.build b/meson_cpu/s390x/meson.build
@@ -7,12 +7,12 @@ VX = mod_features.new(
 )
 VXE = mod_features.new(
   'VXE', 2, implies: VX, args: {'val': '-march=arch12', 'match': '-march=.*'},
-  detect: {'val': 'VXE', 'match': 'VX'},
+  detect: {'val': 'VXE', 'match': '\\bvxe\\b'},
   test_code: files(source_root + '/numpy/distutils/checks/cpu_vxe.c')[0],
 )
 VXE2 = mod_features.new(
   'VXE2', 3, implies: VXE, args: {'val': '-march=arch13', 'match': '-march=.*'},
-  detect: {'val': 'VXE2', 'match': 'VX.*'},
+  detect: {'val': 'VXE2', 'match': '\\bvxe2\\b'},
   test_code: files(source_root + '/numpy/distutils/checks/cpu_vxe2.c')[0],
 )
 S390X_FEATURES = {'VX': VX, 'VXE': VXE, 'VXE2': VXE2}

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ VX = mod_features.new(`
`7`	`7`	`)`
`8`	`8`	`VXE = mod_features.new(`
`9`	`9`	`'VXE', 2, implies: VX, args: {'val': '-march=arch12', 'match': '-march=.*'},`
`10`		`- detect: {'val': 'VXE', 'match': 'VX'},`
	`10`	`+ detect: {'val': 'VXE', 'match': '\\bvxe\\b'},`
`11`	`11`	`test_code: files(source_root + '/numpy/distutils/checks/cpu_vxe.c')[0],`
`12`	`12`	`)`
`13`	`13`	`VXE2 = mod_features.new(`
`14`	`14`	`'VXE2', 3, implies: VXE, args: {'val': '-march=arch13', 'match': '-march=.*'},`
`15`		`- detect: {'val': 'VXE2', 'match': 'VX.*'},`
	`15`	`+ detect: {'val': 'VXE2', 'match': '\\bvxe2\\b'},`
`16`	`16`	`test_code: files(source_root + '/numpy/distutils/checks/cpu_vxe2.c')[0],`
`17`	`17`	`)`
`18`	`18`	`S390X_FEATURES = {'VX': VX, 'VXE': VXE, 'VXE2': VXE2}`